From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Mon, 12 Jan 2015 10:07:58 +0000 (+0100)
Subject: gpio: rcar: Fix error path for devm_kzalloc() failure
X-Git-Tag: v3.16.35~2680
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=625030260318d7869684ee137b1ccdbc92f34144;p=thirdparty%2Fkernel%2Fstable.git

gpio: rcar: Fix error path for devm_kzalloc() failure

commit 7d82bf3419c103dbb730e7834186fc5d577b9da1 upstream.

If the call to devm_kzalloc() fails, nothing must be cleant up.
This was missed before because gpio_rcar_probe() had a "return"
statement after the first "goto err0".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: df0c6c80232f2ad4 ("gpio: rcar: Add minimal runtime PM support")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index b6ae89ea88119..c3ea3e9e3d14a 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -363,10 +363,8 @@ static int gpio_rcar_probe(struct platform_device *pdev)
 	int ret;
 
 	p = devm_kzalloc(dev, sizeof(*p), GFP_KERNEL);
-	if (!p) {
-		ret = -ENOMEM;
-		goto err0;
-	}
+	if (!p)
+		return -ENOMEM;
 
 	p->pdev = pdev;
 	spin_lock_init(&p->lock);