The following commit has been merged in the linux branch: commit a2e62f3a852e1e8187853291f5ee09ad4c881fcc Author: Ralf Roesch ralf.roesch@rw-gmbh.de Date: Wed Sep 16 08:01:20 2009 +0200

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 c860810..dfe4720 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: