Skip to contentSkip to conversation

Fix priority mistakes in acpi_battery_update()

PATCH New Roel Kluin 1 participant 1 message Oct 26, 2007 ACPI

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 Fix priority mistakes in acpi_battery_update()

Fixes priority mistakes similar to '!x & y'

Signed-off-by Roel Kluin <[email protected]>

---

drivers/acpi/battery.c +2 -6
index 9b2c0f7..3762ce2 100644
@@ -420,8 +420,7 @@ static int acpi_battery_update(struct acpi_battery *battery,
 		result = acpi_battery_get_status(battery);
 		if (result)
 			goto end;
-		if ((!battery->flags.battery_present_prev & acpi_battery_present(battery))
-		    || (battery->flags.battery_present_prev & !acpi_battery_present(battery))) {
+		if (battery->flags.battery_present_prev != acpi_battery_present(battery)) {
 			result = acpi_battery_init_update(battery);
 			if (result)
 				goto end;

@@ -448,10 +447,7 @@ static void acpi_battery_notify_update(struct acpi_battery *battery)
 		return;
 	}
 
-	if ((!battery->flags.battery_present_prev &
-	     acpi_battery_present(battery)) ||
-	    (battery->flags.battery_present_prev &
-	     !acpi_battery_present(battery))) {
+	if (battery->flags.battery_present_prev != acpi_battery_present(battery)) {
 		battery->flags.init_update = 1;
 	} else {
 		battery->flags.update[ACPI_BATTERY_INFO] = 1;