Merge tag 'v3.17-rc1' into patchwork

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

diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c
index b18a1a26425ed81e1c676af88d8c5b7c4ca4e8bd..58ce75c188b71106a86d19ff49f429cee2c57115 100644 (file)
--- a/drivers/gpio/gpio-wm831x.c
+++ b/drivers/gpio/gpio-wm831x.c
@@ -279,7 +279,8 @@ static int wm831x_gpio_remove(struct platform_device *pdev)
 {
        struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);
 
-       return  gpiochip_remove(&wm831x_gpio->gpio_chip);
+       gpiochip_remove(&wm831x_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver wm831x_gpio_driver = {