Patchwork [5/6] ACPI / Battery: Add the check before refresh sysfs in the battery_notify()

login
register
mail settings
Submitter lan,Tianyu
Date June 29, 2011, 8:24 a.m.
Message ID <1309335874-26588-1-git-send-email-tianyu.lan@intel.com>
Download mbox | patch
Permalink /patch/927582/
State New, archived
Headers show

Comments

lan,Tianyu - June 29, 2011, 8:24 a.m.
In the commit 25be5821, add the refresh sysfs when system resumes
from suspend. But it didn't check that the battery exists. This
will cause battery sysfs 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>
---
 drivers/acpi/battery.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index cc35bdc..cb4a554 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;
 	}