Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux

[linux-2.6-block.git] / drivers / gpio / gpio-sx150x.c

diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index b51ca9f5c14018e3213aed4ccdf38c7a3d52a8f1..bce6c6108f2022623d5769d6a3e0a8b20ca1a5bc 100644 (file)
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -615,19 +615,16 @@ static int sx150x_probe(struct i2c_client *client,
 
        return 0;
 probe_fail_post_gpiochip_add:
-       WARN_ON(gpiochip_remove(&chip->gpio_chip) < 0);
+       gpiochip_remove(&chip->gpio_chip);
        return rc;
 }
 
 static int sx150x_remove(struct i2c_client *client)
 {
        struct sx150x_chip *chip;
-       int rc;
 
        chip = i2c_get_clientdata(client);
-       rc = gpiochip_remove(&chip->gpio_chip);
-       if (rc < 0)
-               return rc;
+       gpiochip_remove(&chip->gpio_chip);
 
        if (chip->irq_summary >= 0)
                sx150x_remove_irq_chip(chip);