diff options
author | Matthew Garrett <matthew.garrett@nebula.com> | 2014-08-20 08:18:18 -0700 |
---|---|---|
committer | Matthew Garrett <matthew.garrett@nebula.com> | 2014-08-20 08:18:18 -0700 |
commit | 8039aabb6c9f802bca04cc77ca210060a5b53916 (patch) | |
tree | cff5766be2ebf3ed3f75566922a516ab220b144d | |
parent | 186e4e89a0922d75fba476f15b723e541cc34bea (diff) | |
download | linux-8039aabb6c9f802bca04cc77ca210060a5b53916.tar.bz2 |
Revert "platform/x86/toshiba-apci.c possible bad if test?"
This reverts commit bdc3ae7221213963f438faeaa69c8b4a2195f491.
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
-rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index e4da61bcbf8b..b062d3d7b373 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: |