X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fpower%2Fpower_core.c;h=b72286d42961264bb12171e30bc6593eb446b466;hb=2399e40120f7a04fc24d496f486e5e406852538f;hp=d79971ba884154a469d602d806420e866509b08e;hpb=8b485ba12b0defa0c4ed3559789250238f8331a8;p=u-boot

diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c
index d79971ba88..b72286d429 100644
--- a/drivers/power/power_core.c
+++ b/drivers/power/power_core.c
@@ -23,7 +23,7 @@ int check_reg(struct pmic *p, u32 reg)
 	if (reg >= p->number_of_regs) {
 		printf("<reg num> = %d is invalid. Should be less than %d\n",
 		       reg, p->number_of_regs);
-		return -1;
+		return -EINVAL;
 	}
 
 	return 0;
@@ -34,7 +34,7 @@ int pmic_set_output(struct pmic *p, u32 reg, int out, int on)
 	u32 val;
 
 	if (pmic_reg_read(p, reg, &val))
-		return -1;
+		return -ENOTSUPP;
 
 	if (on)
 		val |= out;
@@ -42,7 +42,7 @@ int pmic_set_output(struct pmic *p, u32 reg, int out, int on)
 		val &= ~out;
 
 	if (pmic_reg_write(p, reg, val))
-		return -1;
+		return -ENOTSUPP;
 
 	return 0;
 }
@@ -59,7 +59,7 @@ static int pmic_dump(struct pmic *p)
 
 	if (!p) {
 		puts("Wrong PMIC name!\n");
-		return -1;
+		return -ENODEV;
 	}
 
 	pmic_show_info(p);
@@ -140,6 +140,9 @@ int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		return CMD_RET_SUCCESS;
 	}
 
+	if (argc < 3)
+		return CMD_RET_USAGE;
+
 	name = argv[1];
 	cmd = argv[2];
 
@@ -184,18 +187,21 @@ int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		if (argc < 4)
 			return CMD_RET_USAGE;
 
+		if (!p->pbat) {
+			printf("%s is not a battery\n", p->name);
+			return CMD_RET_FAILURE;
+		}
+
 		if (strcmp(argv[3], "state") == 0)
 			p->fg->fg_battery_check(p->pbat->fg, p);
 
 		if (strcmp(argv[3], "charge") == 0) {
-			if (p->pbat) {
-				printf("BAT: %s charging (ctrl+c to break)\n",
-				       p->name);
-				if (p->low_power_mode)
-					p->low_power_mode();
-				if (p->pbat->battery_charge)
-					p->pbat->battery_charge(p);
-			}
+			printf("BAT: %s charging (ctrl+c to break)\n",
+			       p->name);
+			if (p->low_power_mode)
+				p->low_power_mode();
+			if (p->pbat->battery_charge)
+				p->pbat->battery_charge(p);
 		}
 
 		return CMD_RET_SUCCESS;