diff options
Diffstat (limited to 'drivers/hwmon/ads7828.c')
-rw-r--r-- | drivers/hwmon/ads7828.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/hwmon/ads7828.c b/drivers/hwmon/ads7828.c index bf3fdf495595..1f9e8af0f322 100644 --- a/drivers/hwmon/ads7828.c +++ b/drivers/hwmon/ads7828.c | |||
@@ -154,7 +154,6 @@ static int ads7828_remove(struct i2c_client *client) | |||
154 | struct ads7828_data *data = i2c_get_clientdata(client); | 154 | struct ads7828_data *data = i2c_get_clientdata(client); |
155 | hwmon_device_unregister(data->hwmon_dev); | 155 | hwmon_device_unregister(data->hwmon_dev); |
156 | sysfs_remove_group(&client->dev.kobj, &ads7828_group); | 156 | sysfs_remove_group(&client->dev.kobj, &ads7828_group); |
157 | kfree(i2c_get_clientdata(client)); | ||
158 | return 0; | 157 | return 0; |
159 | } | 158 | } |
160 | 159 | ||
@@ -217,11 +216,10 @@ static int ads7828_probe(struct i2c_client *client, | |||
217 | struct ads7828_data *data; | 216 | struct ads7828_data *data; |
218 | int err; | 217 | int err; |
219 | 218 | ||
220 | data = kzalloc(sizeof(struct ads7828_data), GFP_KERNEL); | 219 | data = devm_kzalloc(&client->dev, sizeof(struct ads7828_data), |
221 | if (!data) { | 220 | GFP_KERNEL); |
222 | err = -ENOMEM; | 221 | if (!data) |
223 | goto exit; | 222 | return -ENOMEM; |
224 | } | ||
225 | 223 | ||
226 | i2c_set_clientdata(client, data); | 224 | i2c_set_clientdata(client, data); |
227 | mutex_init(&data->update_lock); | 225 | mutex_init(&data->update_lock); |
@@ -229,7 +227,7 @@ static int ads7828_probe(struct i2c_client *client, | |||
229 | /* Register sysfs hooks */ | 227 | /* Register sysfs hooks */ |
230 | err = sysfs_create_group(&client->dev.kobj, &ads7828_group); | 228 | err = sysfs_create_group(&client->dev.kobj, &ads7828_group); |
231 | if (err) | 229 | if (err) |
232 | goto exit_free; | 230 | return err; |
233 | 231 | ||
234 | data->hwmon_dev = hwmon_device_register(&client->dev); | 232 | data->hwmon_dev = hwmon_device_register(&client->dev); |
235 | if (IS_ERR(data->hwmon_dev)) { | 233 | if (IS_ERR(data->hwmon_dev)) { |
@@ -241,9 +239,6 @@ static int ads7828_probe(struct i2c_client *client, | |||
241 | 239 | ||
242 | exit_remove: | 240 | exit_remove: |
243 | sysfs_remove_group(&client->dev.kobj, &ads7828_group); | 241 | sysfs_remove_group(&client->dev.kobj, &ads7828_group); |
244 | exit_free: | ||
245 | kfree(data); | ||
246 | exit: | ||
247 | return err; | 242 | return err; |
248 | } | 243 | } |
249 | 244 | ||