diff options
| author | Jean Delvare <khali@linux-fr.org> | 2011-04-29 10:33:36 -0400 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2011-04-29 10:33:36 -0400 |
| commit | bc4d45f1901042a295b10949f51d24cce223e65d (patch) | |
| tree | 61de31e24034cce008e7fd2544ccfdaa95678acd /drivers/hwmon/lm85.c | |
| parent | 5f441e2256506a5878d276399e0a22a13942fe4b (diff) | |
hwmon: (lm85) Fix error paths in probe function
We must remove all files we created, even in error cases.
Fixes second part of kernel bug #34072:
https://bugzilla.kernel.org/show_bug.cgi?id=34072
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers/hwmon/lm85.c')
| -rw-r--r-- | drivers/hwmon/lm85.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c index b5a6bc48597e..da72dc12068c 100644 --- a/drivers/hwmon/lm85.c +++ b/drivers/hwmon/lm85.c | |||
| @@ -1331,11 +1331,11 @@ static int lm85_probe(struct i2c_client *client, | |||
| 1331 | if (data->type != emc6d103s) { | 1331 | if (data->type != emc6d103s) { |
| 1332 | err = sysfs_create_group(&client->dev.kobj, &lm85_group_minctl); | 1332 | err = sysfs_create_group(&client->dev.kobj, &lm85_group_minctl); |
| 1333 | if (err) | 1333 | if (err) |
| 1334 | goto err_kfree; | 1334 | goto err_remove_files; |
| 1335 | err = sysfs_create_group(&client->dev.kobj, | 1335 | err = sysfs_create_group(&client->dev.kobj, |
| 1336 | &lm85_group_temp_off); | 1336 | &lm85_group_temp_off); |
| 1337 | if (err) | 1337 | if (err) |
| 1338 | goto err_kfree; | 1338 | goto err_remove_files; |
| 1339 | } | 1339 | } |
| 1340 | 1340 | ||
| 1341 | /* The ADT7463/68 have an optional VRM 10 mode where pin 21 is used | 1341 | /* The ADT7463/68 have an optional VRM 10 mode where pin 21 is used |