Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / regulator / da9210-regulator.c

diff --git a/drivers/regulator/da9210-regulator.c b/drivers/regulator/da9210-regulator.c
index 6f5ecbe..7a320dd 100644 (file)
--- a/drivers/regulator/da9210-regulator.c
+++ b/drivers/regulator/da9210-regulator.c
@@ -134,11 +134,8 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
        int error;
 
        chip = devm_kzalloc(&i2c->dev, sizeof(struct da9210), GFP_KERNEL);
-       if (NULL == chip) {
-               dev_err(&i2c->dev,
-                       "Cannot kzalloc memory for regulator structure\n");
+       if (!chip)
                return -ENOMEM;
-       }
 
        chip->regmap = devm_regmap_init_i2c(i2c, &da9210_regmap_config);
        if (IS_ERR(chip->regmap)) {