Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[linux-2.6-microblaze.git] / drivers / gpio / gpio-max732x.c

diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index c04fae1..9d8bcc6 100644 (file)
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -709,8 +709,7 @@ static int max732x_probe(struct i2c_client *client,
        return 0;
 
 out_failed:
-       if (chip->client_dummy)
-               i2c_unregister_device(chip->client_dummy);
+       i2c_unregister_device(chip->client_dummy);
        return ret;
 }
 
@@ -734,8 +733,7 @@ static int max732x_remove(struct i2c_client *client)
        gpiochip_remove(&chip->gpio_chip);
 
        /* unregister any dummy i2c_client */
-       if (chip->client_dummy)
-               i2c_unregister_device(chip->client_dummy);
+       i2c_unregister_device(chip->client_dummy);
 
        return 0;
 }