From: Bryan Wu Date: Tue, 3 Jul 2012 05:04:32 +0000 (+0800) Subject: leds: convert LP3944 LED driver to devm_kzalloc() X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9813d74fa55fba7a974d66d452d1d699ee15073b;p=~shefty%2Frdma-dev.git leds: convert LP3944 LED driver to devm_kzalloc() Cc: Antonio Ospite Signed-off-by: Bryan Wu --- diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c index b8f9f0a5d43..c298f7d9f53 100644 --- a/drivers/leds/leds-lp3944.c +++ b/drivers/leds/leds-lp3944.c @@ -393,7 +393,8 @@ static int __devinit lp3944_probe(struct i2c_client *client, return -ENODEV; } - data = kzalloc(sizeof(struct lp3944_data), GFP_KERNEL); + data = devm_kzalloc(&client->dev, sizeof(struct lp3944_data), + GFP_KERNEL); if (!data) return -ENOMEM; @@ -403,10 +404,8 @@ static int __devinit lp3944_probe(struct i2c_client *client, mutex_init(&data->lock); err = lp3944_configure(client, data, lp3944_pdata); - if (err < 0) { - kfree(data); + if (err < 0) return err; - } dev_info(&client->dev, "lp3944 enabled\n"); return 0; @@ -431,8 +430,6 @@ static int __devexit lp3944_remove(struct i2c_client *client) break; } - kfree(data); - return 0; }