From: Ralf Roesch <ralf.roesch@rw-gmbh.de>
Date: Wed, 16 Sep 2009 06:01:20 +0000 (+0200)
Subject: MIPS: TXx9: Fix error handling / Fix for noenexisting gpio_remove.
X-Git-Tag: v2.6.32-rc6~2^2~27
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a2e62f3a852e1e8187853291f5ee09ad4c881fcc;p=linux-2.6-block.git

MIPS: TXx9: Fix error handling / Fix for noenexisting gpio_remove.

Error was introduced by commit 0385d1f3d394c6814be0b165c153fc3fc254469a.

Signed-off-by: Ralf Roesch <ralf.roesch@rw-gmbh.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index c860810722c0..dfe4720ac82e 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -817,7 +817,8 @@ void __init txx9_iocled_init(unsigned long baseaddr,
 out_pdev:
 	platform_device_put(pdev);
 out_gpio:
-	gpio_remove(&iocled->chip);
+	if (gpiochip_remove(&iocled->chip))
+		return;
 out_unmap:
 	iounmap(iocled->mmioaddr);
 out_free: