From 53deb479038c1da9b75ea85dfc39ba923ad029d6 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 09:58:11 -0700 Subject: [PATCH] --- yaml --- r: 315997 b: refs/heads/master c: 4a8ad25af56fa55746a97c4f48985154eb82a842 h: refs/heads/master i: 315995: 6a62b8766743ae430050f64409753874245fcf24 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/lm93.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 1c532869ca27..5f7fe312b808 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 705375cc41f2bd63dfffcf4830afff76c63e5681 +refs/heads/master: 4a8ad25af56fa55746a97c4f48985154eb82a842 diff --git a/trunk/drivers/hwmon/lm93.c b/trunk/drivers/hwmon/lm93.c index 67e8fe256e02..bf946187bd37 100644 --- a/trunk/drivers/hwmon/lm93.c +++ b/trunk/drivers/hwmon/lm93.c @@ -2738,15 +2738,13 @@ static int lm93_probe(struct i2c_client *client, } else { dev_dbg(&client->dev, "detect failed, " "smbus byte and/or word data not supported!\n"); - err = -ENODEV; - goto err_out; + return -ENODEV; } - data = kzalloc(sizeof(struct lm93_data), GFP_KERNEL); + data = devm_kzalloc(&client->dev, sizeof(struct lm93_data), GFP_KERNEL); if (!data) { dev_dbg(&client->dev, "out of memory!\n"); - err = -ENOMEM; - goto err_out; + return -ENOMEM; } i2c_set_clientdata(client, data); @@ -2760,7 +2758,7 @@ static int lm93_probe(struct i2c_client *client, err = sysfs_create_group(&client->dev.kobj, &lm93_attr_grp); if (err) - goto err_free; + return err; /* Register hwmon driver class */ data->hwmon_dev = hwmon_device_register(&client->dev); @@ -2770,9 +2768,6 @@ static int lm93_probe(struct i2c_client *client, err = PTR_ERR(data->hwmon_dev); dev_err(&client->dev, "error registering hwmon device.\n"); sysfs_remove_group(&client->dev.kobj, &lm93_attr_grp); -err_free: - kfree(data); -err_out: return err; } @@ -2783,7 +2778,6 @@ static int lm93_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &lm93_attr_grp); - kfree(data); return 0; }