From b5ce63358180176098cc912f75501e9a41ed5511 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 16 Jun 2012 18:24:02 -0700 Subject: [PATCH] --- yaml --- r: 315991 b: refs/heads/master c: 52714c04df4b12ca308a1d792d50681df43365c2 h: refs/heads/master i: 315989: d59b5b6666dc06479ad9fc520d4b723aded99a0d 315987: 4ef889ba0509b80560c2c92f4904cab2fa546285 315983: 8a7f1461e9230be80571ad8ef157e7510e5a0b81 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/lm77.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ed94ab31e168..e3517e26cbbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efd2d117aeb5f01cc9c90e56fff29d4a5f535580 +refs/heads/master: 52714c04df4b12ca308a1d792d50681df43365c2 diff --git a/trunk/drivers/hwmon/lm77.c b/trunk/drivers/hwmon/lm77.c index 3ccc23a0c7f5..f82acf67acf5 100644 --- a/trunk/drivers/hwmon/lm77.c +++ b/trunk/drivers/hwmon/lm77.c @@ -343,11 +343,9 @@ static int lm77_probe(struct i2c_client *client, const struct i2c_device_id *id) struct lm77_data *data; int err; - data = kzalloc(sizeof(struct lm77_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(dev, sizeof(struct lm77_data), GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); data->valid = 0; @@ -359,7 +357,7 @@ static int lm77_probe(struct i2c_client *client, const struct i2c_device_id *id) /* Register sysfs hooks */ err = sysfs_create_group(&dev->kobj, &lm77_group); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(dev); if (IS_ERR(data->hwmon_dev)) { @@ -371,9 +369,6 @@ static int lm77_probe(struct i2c_client *client, const struct i2c_device_id *id) exit_remove: sysfs_remove_group(&dev->kobj, &lm77_group); -exit_free: - kfree(data); -exit: return err; } @@ -382,7 +377,6 @@ static int lm77_remove(struct i2c_client *client) struct lm77_data *data = i2c_get_clientdata(client); hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &lm77_group); - kfree(data); return 0; }