]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mfd: twl-core: Return directly after a failed platform_device_alloc() in add_numbered...
authorMarkus Elfring <elfring@users.sourceforge.net>
Sun, 26 Jun 2016 10:25:36 +0000 (12:25 +0200)
committerLee Jones <lee.jones@linaro.org>
Wed, 29 Jun 2016 09:16:11 +0000 (10:16 +0100)
The platform_device_put() function was called in one case by the
add_numbered_child() function during error handling even if the passed
variable "pdev" contained a null pointer.
Return directly in this case.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/twl-core.c

index 831696ee2472b4ccee8c16304e32f98b54670a25..9458c6df39ede45b612f9b06dc6a00b470b14feb 100644 (file)
@@ -622,11 +622,8 @@ add_numbered_child(unsigned mod_no, const char *name, int num,
        twl = &twl_priv->twl_modules[sid];
 
        pdev = platform_device_alloc(name, num);
-       if (!pdev) {
-               dev_dbg(&twl->client->dev, "can't alloc dev\n");
-               status = -ENOMEM;
-               goto err;
-       }
+       if (!pdev)
+               return ERR_PTR(-ENOMEM);
 
        pdev->dev.parent = &twl->client->dev;