From 784a337bc3faa591ef14369b49ae93d4a4b1b163 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 09:58:10 -0700 Subject: [PATCH] --- yaml --- r: 315977 b: refs/heads/master c: 20f426ff028202b2c0df947a3468ed4717f598d6 h: refs/heads/master i: 315975: 59b520ada511e6239a29567c76474739188c0c67 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/lm90.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 594010296dc8..832521094dbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c087f73a249154ed83e451343d9eff0f299291a3 +refs/heads/master: 20f426ff028202b2c0df947a3468ed4717f598d6 diff --git a/trunk/drivers/hwmon/lm90.c b/trunk/drivers/hwmon/lm90.c index 22b14a68e35e..863412a02bdd 100644 --- a/trunk/drivers/hwmon/lm90.c +++ b/trunk/drivers/hwmon/lm90.c @@ -1399,11 +1399,10 @@ static int lm90_probe(struct i2c_client *client, struct lm90_data *data; int err; - data = kzalloc(sizeof(struct lm90_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct lm90_data), GFP_KERNEL); + if (!data) + return -ENOMEM; + i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -1474,8 +1473,6 @@ static int lm90_probe(struct i2c_client *client, lm90_remove_files(client, data); exit_restore: lm90_restore_conf(client, data); - kfree(data); -exit: return err; } @@ -1487,7 +1484,6 @@ static int lm90_remove(struct i2c_client *client) lm90_remove_files(client, data); lm90_restore_conf(client, data); - kfree(data); return 0; }