Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-zesty-kernel.git] / drivers / regulator / fan53555.c

diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 7ca3d9e3b0fe22e426fb5419d76b9a4089224c7f..714fd9a89aa137b7484e437ff5017374e834f191 100644 (file)
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -90,11 +90,11 @@ static int fan53555_set_suspend_voltage(struct regulator_dev *rdev, int uV)
                return 0;
        ret = regulator_map_voltage_linear(rdev, uV, uV);
        if (ret < 0)
-               return -EINVAL;
+               return ret;
        ret = regmap_update_bits(di->regmap, di->sleep_reg,
                                        VSEL_NSEL_MASK, ret);
        if (ret < 0)
-               return -EINVAL;
+               return ret;
        /* Cache the sleep voltage setting.
         * Might not be the real voltage which is rounded */
        di->sleep_vol_cache = uV;
@@ -244,10 +244,9 @@ static int fan53555_regulator_probe(struct i2c_client *client,
 
        di = devm_kzalloc(&client->dev, sizeof(struct fan53555_device_info),
                                        GFP_KERNEL);
-       if (!di) {
-               dev_err(&client->dev, "Failed to allocate device info data!\n");
+       if (!di)
                return -ENOMEM;
-       }
+
        di->regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config);
        if (IS_ERR(di->regmap)) {
                dev_err(&client->dev, "Failed to allocate regmap!\n");
@@ -260,14 +259,14 @@ static int fan53555_regulator_probe(struct i2c_client *client,
        ret = regmap_read(di->regmap, FAN53555_ID1, &val);
        if (ret < 0) {
                dev_err(&client->dev, "Failed to get chip ID!\n");
-               return -ENODEV;
+               return ret;
        }
        di->chip_id = val & DIE_ID;
        /* Get chip revision */
        ret = regmap_read(di->regmap, FAN53555_ID2, &val);
        if (ret < 0) {
                dev_err(&client->dev, "Failed to get chip Rev!\n");
-               return -ENODEV;
+               return ret;
        }
        di->chip_rev = val & DIE_REV;
        dev_info(&client->dev, "FAN53555 Option[%d] Rev[%d] Detected!\n",