Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / wm8994-regulator.c

diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 71c5911f2e7130b2114d19b7619a30e69672a94a..c24346db8a71139e202c60464317e4fc03123253 100644 (file)
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -134,10 +134,8 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
        dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_ldo), GFP_KERNEL);
-       if (ldo == NULL) {
-               dev_err(&pdev->dev, "Unable to allocate private data\n");
+       if (!ldo)
                return -ENOMEM;
-       }
 
        ldo->wm8994 = wm8994;
        ldo->supply = wm8994_ldo_consumer[id];