From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 26 Jun 2016 11:40:35 +0000 (+0200)
Subject: mfd: dm355evm_msp: Return directly after a failed platform_device_alloc() in add_child()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d313cdde71ec9a5c327a515c37a0dca2cca00de5;p=linux-beck.git

mfd: dm355evm_msp: Return directly after a failed platform_device_alloc() in add_child()

The platform_device_put() function was called in one case by the
add_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>
---

diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index 14661ec5ef7f..270e19c0bba1 100644
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -199,11 +199,8 @@ static struct device *add_child(struct i2c_client *client, const char *name,
 	int			status;
 
 	pdev = platform_device_alloc(name, -1);
-	if (!pdev) {
-		dev_dbg(&client->dev, "can't alloc dev\n");
-		status = -ENOMEM;
-		goto err;
-	}
+	if (!pdev)
+		return ERR_PTR(-ENOMEM);
 
 	device_init_wakeup(&pdev->dev, can_wakeup);
 	pdev->dev.parent = &client->dev;