diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /drivers/misc/eeepc-laptop.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
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 | ||