Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[sfrench/cifs-2.6.git] / drivers / gpio / gpio-grgpio.c

diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c
index 3c3f515b7916b1a32b2c25a1845989df978a7f03..66ad3df9d9cfdbbb3acab6af63df4a6101d8671a 100644 (file)
--- a/drivers/gpio/gpio-grgpio.c
+++ b/drivers/gpio/gpio-grgpio.c
@@ -468,9 +468,7 @@ static int grgpio_remove(struct platform_device *ofdev)
                }
        }
 
-       ret = gpiochip_remove(&priv->bgc.gc);
-       if (ret)
-               goto out;
+       gpiochip_remove(&priv->bgc.gc);
 
        if (priv->domain)
                irq_domain_remove(priv->domain);