Skip to content

Commit

Permalink
drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Linus Torvalds committed Mar 23, 2012
1 parent 3a2fd4a commit 920c4f4
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/leds/leds-tca6507.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 920c4f4

Please sign in to comment.