diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-20 19:23:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-20 19:23:06 -0400 |
| commit | 3951ad2e051543f6cd01706da477a73f19165eb6 (patch) | |
| tree | 34f7bfc370aa9c4fefb84bc3cc9e7e950406db5b | |
| parent | e9de42d8eeffdc23af0144cafa9e3deacc489fb9 (diff) | |
| parent | 8039aabb6c9f802bca04cc77ca210060a5b53916 (diff) | |
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platform driver revert from Matthew Garrett:
"This clearly shouldn't have been merged. No excuse on my part"
* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
Revert "platform/x86/toshiba-apci.c possible bad if test?"
| -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, | |||
| 1258 | int mode = -1; | 1258 | int mode = -1; |
| 1259 | int time = -1; | 1259 | int time = -1; |
| 1260 | 1260 | ||
| 1261 | if (sscanf(buf, "%i", &mode) != 1 || (mode != 2 || mode != 1)) | 1261 | if (sscanf(buf, "%i", &mode) != 1 && (mode != 2 || mode != 1)) |
| 1262 | return -EINVAL; | 1262 | return -EINVAL; |
| 1263 | 1263 | ||
| 1264 | /* Set the Keyboard Backlight Mode where: | 1264 | /* Set the Keyboard Backlight Mode where: |