Modify "ectool chargecontol normal" so that it does not disable battery_sustainer

Signed-off-by: James Courtier-Dutton <james@superbug.co.uk>

Author: James Courtier-Dutton

util/ectool.cc

@@ -7639,7 +7639,7 @@ static void cmd_charge_control_help(const char *cmd, const char *msg)
 		"  Usage: %s\n"
 		"    Get current settings.\n"
 		"  Usage: %s normal|idle|discharge\n"
-		"    Set charge mode (and disable battery sustainer).\n"
+		"    Set charge mode.\n"
 		"  Usage: %s normal <lower> <upper> [<flags>]\n"
 		"    Enable battery sustainer. <lower> and <upper> are battery SoC\n"
 		"    between which EC tries to keep the battery level.\n"
@@ -7701,8 +7701,8 @@ int cmd_charge_control(int argc, char *argv[])
 	if (!strcasecmp(argv[1], "normal")) {
 		p.mode = CHARGE_CONTROL_NORMAL;
 		if (argc == 2) {
-			p.sustain_soc.lower = -1;
-			p.sustain_soc.upper = -1;
+			p.sustain_soc.lower = sustain_soc.lower;
+			p.sustain_soc.upper = sustain_soc.upper;
 		} else if (argc > 3) {
 			p.sustain_soc.lower = strtol(argv[2], &e, 0);
 			if (e && *e) {
@@ -7734,12 +7734,16 @@ int cmd_charge_control(int argc, char *argv[])
 			cmd_charge_control_help(argv[0], "Bad arguments");
 			return -1;
 		}
+		p.sustain_soc.lower = sustain_soc.lower;
+		p.sustain_soc.upper = sustain_soc.upper;
 		p.mode = CHARGE_CONTROL_IDLE;
 	} else if (!strcasecmp(argv[1], "discharge")) {
 		if (argc != 2) {
 			cmd_charge_control_help(argv[0], "Bad arguments");
 			return -1;
 		}
+		p.sustain_soc.lower = sustain_soc.lower;
+		p.sustain_soc.upper = sustain_soc.upper;
 		p.mode = CHARGE_CONTROL_DISCHARGE;
 	} else {
 		cmd_charge_control_help(argv[0], "Bad sub-command");