commit 8039aabb6c9f802bca04cc77ca210060a5b53916
author Matthew Garrett <matthew.garrett@nebula.com> Wed Aug 20 08:18:18 2014 -0700
committer Matthew Garrett <matthew.garrett@nebula.com> Wed Aug 20 08:18:18 2014 -0700
tree cff5766be2ebf3ed3f75566922a516ab220b144d
parent 186e4e89a0922d75fba476f15b723e541cc34bea

Revert "platform/x86/toshiba-apci.c possible bad if test?"

This reverts commit bdc3ae7221213963f438faeaa69c8b4a2195f491.

Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

drivers/platform/x86/toshiba_acpi.c

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index e4da61b..b062d3d 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1258,7 +1258,7 @@
 	int mode = -1;
 	int time = -1;
 
-	if (sscanf(buf, "%i", &mode) != 1  || (mode != 2 || mode != 1))
+	if (sscanf(buf, "%i", &mode) != 1 && (mode != 2 || mode != 1))
 		return -EINVAL;
 
 	/* Set the Keyboard Backlight Mode where: