diff --git a/[refs] b/[refs]
index 6d2ca63e545c..9b3c9359e04d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5a5911b3278bad6515a9958f7318f74d534ef64
+refs/heads/master: 6e17fb6aa1a67afa1827ae317c3594040f055730
diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c
index 2fe7cfd95680..4ba339d0ea19 100644
--- a/trunk/drivers/acpi/battery.c
+++ b/trunk/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;
 	}