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

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

diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c
index 2445fe771179797cbfedee338c43ac036ded74e6..d502825159b9b4925e4e129f02fd5a7da7f3bc96 100644 (file)
--- a/drivers/gpio/gpio-ucb1400.c
+++ b/drivers/gpio/gpio-ucb1400.c
@@ -70,7 +70,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
        if (err)
                goto err;
 
-       if (ucb && ucb->gpio_setup)
+       if (ucb->gpio_setup)
                err = ucb->gpio_setup(&dev->dev, ucb->gc.ngpio);
 
 err:
@@ -89,7 +89,7 @@ static int ucb1400_gpio_remove(struct platform_device *dev)
                        return err;
        }
 
-       err = gpiochip_remove(&ucb->gc);
+       gpiochip_remove(&ucb->gc);
        return err;
 }