drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe()
Dan Carpenter [Fri, 23 Mar 2012 22:02:07 +0000 (15:02 -0700)]
Just a small tidy-up.

1) There is a NULL dereference if the tca allocation fails.
2) The call to cancel_work_sync() isn't needed because we haven't
   scheduled any work.
3) The call to i2c_set_clientdata() isn't needed because the core
   handles that automatically if probe() fails.
4) I added some curly braces for style reasons.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/leds/leds-tca6507.c

index 133f89f..ec06a81 100644 (file)
@@ -687,10 +687,9 @@ static int __devinit tca6507_probe(struct i2c_client *client,
                        NUM_LEDS);
                return -ENODEV;
        }
-       err = -ENOMEM;
        tca = kzalloc(sizeof(*tca), GFP_KERNEL);
        if (!tca)
-               goto exit;
+               return -ENOMEM;
 
        tca->client = client;
        INIT_WORK(&tca->work, tca6507_work);
@@ -724,11 +723,10 @@ static int __devinit tca6507_probe(struct i2c_client *client,
 
        return 0;
 exit:
-       while (i--)
+       while (i--) {
                if (tca->leds[i].led_cdev.name)
                        led_classdev_unregister(&tca->leds[i].led_cdev);
-       cancel_work_sync(&tca->work);
-       i2c_set_clientdata(client, NULL);
+       }
        kfree(tca);
        return err;
 }