aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBryan Wu <bryan.wu@canonical.com>2012-07-04 00:20:41 -0400
committerBryan Wu <bryan.wu@canonical.com>2012-07-23 19:52:39 -0400
commit6770fc60c4fb3fac9578013103012b7cd0355e44 (patch)
tree6e30eba5b9c671dc4f4f45968c6301ff9576f953 /drivers
parenta44cdd2c1a527a08069d9635a9e8e1a2e9473e98 (diff)
leds: convert TCA6507 LED driver to devm_kzalloc()
Cc: Neil Brown <neilb@suse.de> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/leds/leds-tca6507.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index f74a45a49f47..dabcf7ae8d0f 100644
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -687,7 +687,7 @@ static int __devinit tca6507_probe(struct i2c_client *client,
687 NUM_LEDS); 687 NUM_LEDS);
688 return -ENODEV; 688 return -ENODEV;
689 } 689 }
690 tca = kzalloc(sizeof(*tca), GFP_KERNEL); 690 tca = devm_kzalloc(&client->dev, sizeof(*tca), GFP_KERNEL);
691 if (!tca) 691 if (!tca)
692 return -ENOMEM; 692 return -ENOMEM;
693 693
@@ -727,7 +727,6 @@ exit:
727 if (tca->leds[i].led_cdev.name) 727 if (tca->leds[i].led_cdev.name)
728 led_classdev_unregister(&tca->leds[i].led_cdev); 728 led_classdev_unregister(&tca->leds[i].led_cdev);
729 } 729 }
730 kfree(tca);
731 return err; 730 return err;
732} 731}
733 732
@@ -743,7 +742,6 @@ static int __devexit tca6507_remove(struct i2c_client *client)
743 } 742 }
744 tca6507_remove_gpio(tca); 743 tca6507_remove_gpio(tca);
745 cancel_work_sync(&tca->work); 744 cancel_work_sync(&tca->work);
746 kfree(tca);
747 745
748 return 0; 746 return 0;
749} 747}