From 74616668663f69f98ff9fc6b54e3e17b0840b6d7 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 20 Aug 2014 08:18:18 -0700 Subject: [PATCH] Revert "platform/x86/toshiba-apci.c possible bad if test?" This reverts commit 30fd8f7736b8d8db079d2bba1121710d0eb5e4bd. Signed-off-by: Matthew Garrett --- drivers/platform/x86/toshiba_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index e4da61bcbf8bb..b062d3d7b3730 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -1258,7 +1258,7 @@ static ssize_t toshiba_kbd_bl_mode_store(struct device *dev, 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: -- 2.39.5