diff options
| author | Lan Tianyu <tianyu.lan@intel.com> | 2011-06-30 05:33:58 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-07-14 06:05:45 +0200 |
| commit | 6e17fb6aa1a67afa1827ae317c3594040f055730 (patch) | |
| tree | 6a3874a0331fcd4e4ff9d44df720028ee8165a06 | |
| parent | ACPI / Battery: Add the hibernation process in the battery_notify() (diff) | |
| download | linux-6e17fb6aa1a67afa1827ae317c3594040f055730.tar.xz linux-6e17fb6aa1a67afa1827ae317c3594040f055730.zip | |
ACPI / Battery: Add the check before refresh sysfs in the battery_notify()
In the commit 25be5821, add the refresh sysfs when system resumes
from suspending. But it didn't check that the battery exists. This
will cause battery sysfs files added when the battery doesn't exist.
This patch add the check before refreshing.
https://bugzilla.kernel.org/show_bug.cgi?id=35642
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/battery.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 2fe7cfd95680..4ba339d0ea19 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -949,8 +949,10 @@ static int battery_notify(struct notifier_block *nb, switch (mode) { case PM_POST_HIBERNATION: case PM_POST_SUSPEND: - sysfs_remove_battery(battery); - sysfs_add_battery(battery); + if (battery->bat.dev) { + sysfs_remove_battery(battery); + sysfs_add_battery(battery); + } break; } |