Commit 920c4f4c authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds

drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe()

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Acked-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3a2fd4a1
...@@ -687,10 +687,9 @@ static int __devinit tca6507_probe(struct i2c_client *client, ...@@ -687,10 +687,9 @@ static int __devinit tca6507_probe(struct i2c_client *client,
NUM_LEDS); NUM_LEDS);
return -ENODEV; return -ENODEV;
} }
err = -ENOMEM;
tca = kzalloc(sizeof(*tca), GFP_KERNEL); tca = kzalloc(sizeof(*tca), GFP_KERNEL);
if (!tca) if (!tca)
goto exit; return -ENOMEM;
tca->client = client; tca->client = client;
INIT_WORK(&tca->work, tca6507_work); INIT_WORK(&tca->work, tca6507_work);
...@@ -724,11 +723,10 @@ static int __devinit tca6507_probe(struct i2c_client *client, ...@@ -724,11 +723,10 @@ static int __devinit tca6507_probe(struct i2c_client *client,
return 0; return 0;
exit: exit:
while (i--) while (i--) {
if (tca->leds[i].led_cdev.name) if (tca->leds[i].led_cdev.name)
led_classdev_unregister(&tca->leds[i].led_cdev); led_classdev_unregister(&tca->leds[i].led_cdev);
cancel_work_sync(&tca->work); }
i2c_set_clientdata(client, NULL);
kfree(tca); kfree(tca);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment