diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 06:32:13 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 06:32:13 -0400 |
commit | 9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee (patch) | |
tree | 651f7058bbaa2d8b2855286380d614afcf505118 /drivers/misc/eeepc-laptop.c | |
parent | 31db6e9ea1dbdcf66b8227b4f7035dee1b1dd8c0 (diff) | |
parent | bef69ea0dcce574a425feb0a5aa4c63dd108b9a6 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/misc/eeepc-laptop.c')
-rw-r--r-- | drivers/misc/eeepc-laptop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c index 9e8d79e7e9f4..facdb9893c84 100644 --- a/drivers/misc/eeepc-laptop.c +++ b/drivers/misc/eeepc-laptop.c | |||
@@ -553,9 +553,9 @@ static void eeepc_hwmon_exit(void) | |||
553 | hwmon = eeepc_hwmon_device; | 553 | hwmon = eeepc_hwmon_device; |
554 | if (!hwmon) | 554 | if (!hwmon) |
555 | return ; | 555 | return ; |
556 | hwmon_device_unregister(hwmon); | ||
557 | sysfs_remove_group(&hwmon->kobj, | 556 | sysfs_remove_group(&hwmon->kobj, |
558 | &hwmon_attribute_group); | 557 | &hwmon_attribute_group); |
558 | hwmon_device_unregister(hwmon); | ||
559 | eeepc_hwmon_device = NULL; | 559 | eeepc_hwmon_device = NULL; |
560 | } | 560 | } |
561 | 561 | ||