diff --git a/[refs] b/[refs]
index ef6c179aa9df..4569a140d4d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93ad7c07ad487b036add8760dabcc35666a550ef
+refs/heads/master: c9e4172cde0f793dbf48c99bdfd0abe7d18e4b09
diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c
index 681e26b56b11..a291849f6c5d 100644
--- a/trunk/drivers/acpi/battery.c
+++ b/trunk/drivers/acpi/battery.c
@@ -554,10 +554,6 @@ static ssize_t acpi_battery_write_alarm(struct file *file,
 
 	if (!battery || (count > sizeof(alarm_string) - 1))
 		return -EINVAL;
-	if (result) {
-		result = -ENODEV;
-		goto end;
-	}
 	if (!acpi_battery_present(battery)) {
 		result = -ENODEV;
 		goto end;