| Message ID | fe8a131a-2149-2bd6-73f5-b17854209107@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, 26 Jun 2016, SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Sun, 26 Jun 2016 12:25:36 +0200 Please use `git send-email` when sending patches to the list. > 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> > --- > drivers/mfd/twl-core.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) Applied though, thanks. > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index 831696e..9458c6d 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -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; >
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 831696e..9458c6d 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -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;