Merge tag 'for-linus-20140905' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-wm8350.c

diff --git a/drivers/gpio/gpio-wm8350.c b/drivers/gpio/gpio-wm8350.c
index 2487f9d575d3013681274a46688864a4d6b3ec52..060b89303bb6125e28919a4c31f032adf6d7ed0a 100644 (file)
--- a/drivers/gpio/gpio-wm8350.c
+++ b/drivers/gpio/gpio-wm8350.c
@@ -145,7 +145,8 @@ static int wm8350_gpio_remove(struct platform_device *pdev)
 {
        struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&wm8350_gpio->gpio_chip);
+       gpiochip_remove(&wm8350_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver wm8350_gpio_driver = {