diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:41:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 09:41:19 -0700 |
| commit | ef1c5339d9413ab57c9b2aa768f3c67485d11acb (patch) | |
| tree | bf9703cd25a0b598350d630447a3a41c5a9cd5b9 /drivers/hwmon/smsc47m1.c | |
| parent | ed72df448250a6da72b65e7881eb63c5ded3475f (diff) | |
| parent | 68a50b567895ea677645ca3cebc484674123532d (diff) | |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: (smsc47m1) restore missing name attribute
hwmon: (w83627ehf) don't assume bank 0
hwmon: (w83627ehf) read fan_div values during probe
hwmon: fix w83781d temp sensor type setting
Diffstat (limited to 'drivers/hwmon/smsc47m1.c')
| -rw-r--r-- | drivers/hwmon/smsc47m1.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c index 338ee4f5461..d3181967f16 100644 --- a/drivers/hwmon/smsc47m1.c +++ b/drivers/hwmon/smsc47m1.c @@ -585,6 +585,8 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev) if ((err = device_create_file(dev, &dev_attr_alarms))) goto error_remove_files; + if ((err = device_create_file(dev, &dev_attr_name))) + goto error_remove_files; data->class_dev = hwmon_device_register(dev); if (IS_ERR(data->class_dev)) { |