summaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9
diff options
context:
space:
mode:
authorRalf Roesch <ralf.roesch@rw-gmbh.de>2009-09-16 08:01:20 +0200
committerRalf Baechle <ralf@linux-mips.org>2009-11-02 12:00:02 +0100
commita2e62f3a852e1e8187853291f5ee09ad4c881fcc (patch)
tree58da044f980e79d041f7f5cfa7522d79c6f8414a /arch/mips/txx9
parentc49e38c1a5e1c814f07365e7a5773801e20e26b5 (diff)
downloadlinux-a2e62f3a852e1e8187853291f5ee09ad4c881fcc.tar.bz2
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>
Diffstat (limited to 'arch/mips/txx9')
-rw-r--r--arch/mips/txx9/generic/setup.c3
1 files changed, 2 insertions, 1 deletions
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: