Merge tag 'stable/for-linus-3.17-b-rc4-tag' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / drivers / gpio / gpio-tps6586x.c

diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c
index a69fbea..9c9238e 100644 (file)
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@ -137,7 +137,8 @@ static int tps6586x_gpio_remove(struct platform_device *pdev)
 {
        struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&tps6586x_gpio->gpio_chip);
+       gpiochip_remove(&tps6586x_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver tps6586x_gpio_driver = {