Merge git://git.denx.de/u-boot-ubi

[people/ms/u-boot.git] / cmd / regulator.c

diff --git a/cmd/regulator.c b/cmd/regulator.c
index bfea6e04b6746dbb5d8efaa26073761ad9d390f9..b605255180d573a8b4746ebf34b5f1d84392973b 100644 (file)
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -71,7 +71,7 @@ static int curr_dev_and_platdata(struct udevice **devp,
 
        *uc_pdata = dev_get_uclass_platdata(*devp);
        if (!*uc_pdata) {
-               error("Regulator: %s - missing platform data!", currdev->name);
+               pr_err("Regulator: %s - missing platform data!", currdev->name);
                return CMD_RET_FAILURE;
        }
 
@@ -292,7 +292,10 @@ static int do_value(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return CMD_RET_FAILURE;
        }
 
-       ret = regulator_set_value(dev, value);
+       if (!force)
+               ret = regulator_set_value(dev, value);
+       else
+               ret = regulator_set_value_force(dev, value);
        if (ret) {
                printf("Regulator: %s - can't set the Voltage!\n",
                       uc_pdata->name);