diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 09:14:55 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 09:14:55 +0100 |
commit | db8c076b9206ea35b1f7299708d5510b17674db2 (patch) | |
tree | 7a5ee32db0c25bb29598c7c300ce7f2680f533a9 /drivers/hwmon/emc1403.c | |
parent | af6261031317f646d22f994c0b467521e47aa49f (diff) | |
parent | b30a3f6257ed2105259b404d419b4964e363928c (diff) |
Merge remote branch 'linus' into drm-intel-fixes
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 5b58b20dead..8dee3f38fdf 100644 --- a/drivers/hwmon/emc1403.c +++ b/drivers/hwmon/emc1403.c @@ -308,7 +308,6 @@ static int emc1403_probe(struct i2c_client *client, res = sysfs_create_group(&client->dev.kobj, &m_thermal_gr); if (res) { dev_warn(&client->dev, "create group failed\n"); - hwmon_device_unregister(data->hwmon_dev); goto thermal_error1; } data->hwmon_dev = hwmon_device_register(&client->dev); |