Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / power / regulator / fixed.c

diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c
index 656371b2351955cb35791ecdc3550a35309f9d03..97b4a98bf0b63799ede846e15bfc0817493fe6d2 100644 (file)
--- a/drivers/power/regulator/fixed.c
+++ b/drivers/power/regulator/fixed.c
@@ -89,7 +89,7 @@ static int fixed_regulator_get_current(struct udevice *dev)
        return uc_pdata->min_uA;
 }
 
-static bool fixed_regulator_get_enable(struct udevice *dev)
+static int fixed_regulator_get_enable(struct udevice *dev)
 {
        struct fixed_regulator_platdata *dev_pdata = dev_get_platdata(dev);
 
@@ -117,7 +117,7 @@ static int fixed_regulator_set_enable(struct udevice *dev, bool enable)
 
        ret = dm_gpio_set_value(&dev_pdata->gpio, enable);
        if (ret) {
-               error("Can't set regulator : %s gpio to: %d\n", dev->name,
+               pr_err("Can't set regulator : %s gpio to: %d\n", dev->name,
                      enable);
                return ret;
        }