diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-21 07:55:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-21 07:55:11 -0400 |
| commit | 7ed569206ebe7467b9c912b857ec46cf1c361111 (patch) | |
| tree | c3e0b92cc782439c33ae844e2520819a29700897 /drivers/hwmon/emc1403.c | |
| parent | e9d2b064149ff7ef4acbc65a1b9374ac8b218d3e (diff) | |
| parent | b30a3f6257ed2105259b404d419b4964e363928c (diff) | |
Merge commit 'v2.6.36-rc5' into perf/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/hwmon/emc1403.c')
| -rw-r--r-- | drivers/hwmon/emc1403.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c index 5b58b20dead1..8dee3f38fdfb 100644 --- a/drivers/hwmon/emc1403.c +++ b/drivers/hwmon/emc1403.c | |||
| @@ -308,7 +308,6 @@ static int emc1403_probe(struct i2c_client *client, | |||
| 308 | res = sysfs_create_group(&client->dev.kobj, &m_thermal_gr); | 308 | res = sysfs_create_group(&client->dev.kobj, &m_thermal_gr); |
| 309 | if (res) { | 309 | if (res) { |
| 310 | dev_warn(&client->dev, "create group failed\n"); | 310 | dev_warn(&client->dev, "create group failed\n"); |
| 311 | hwmon_device_unregister(data->hwmon_dev); | ||
| 312 | goto thermal_error1; | 311 | goto thermal_error1; |
| 313 | } | 312 | } |
| 314 | data->hwmon_dev = hwmon_device_register(&client->dev); | 313 | data->hwmon_dev = hwmon_device_register(&client->dev); |