diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-03-05 12:51:26 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-03-05 12:51:26 +0100 |
| commit | 1ad6364eeb4f578e423081d1748e8a3fdf1ab01d (patch) | |
| tree | f55731737edf1cfd653b21f2ff9d387e6c53ae24 /drivers/power | |
| parent | 335143c76612a0ae26eef8abeda77641d4f63b50 (diff) | |
| parent | cc07294bc704694ae33db75b25ac557e5917a83f (diff) | |
| download | u-boot-imx-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.zip u-boot-imx-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.tar.gz u-boot-imx-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/battery/bat_trats2.c | 2 | ||||
| -rw-r--r-- | drivers/power/power_core.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/power/battery/bat_trats2.c b/drivers/power/battery/bat_trats2.c index f264832..94015aa 100644 --- a/drivers/power/battery/bat_trats2.c +++ b/drivers/power/battery/bat_trats2.c @@ -8,7 +8,7 @@ #include <common.h> #include <power/pmic.h> #include <power/battery.h> -#include <power/max8997_pmic.h> +#include <power/max77693_pmic.h> #include <errno.h> static struct battery battery_trats; diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c index 29ccc83..fe1f316 100644 --- a/drivers/power/power_core.c +++ b/drivers/power/power_core.c @@ -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]; |