diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-17 15:52:17 +0000 |
| commit | 81e53d0470878165a300d75ac06a5bc5eee543a2 (patch) | |
| tree | 5fdaacfb350c5a290109f98ab29e9858f1f11469 /drivers/platform/x86/toshiba_acpi.c | |
| parent | 15e0964dc2a097de3cf518badf2237b6b6adf7fe (diff) | |
| parent | fcb4ed749c776a2ae89ca40343cbccb6f8981e60 (diff) | |
Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw
Diffstat (limited to 'drivers/platform/x86/toshiba_acpi.c')
| -rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 0cfadb65f7c..7fce391818d 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -975,10 +975,8 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) u32 hci_result; dev->hotkey_dev = input_allocate_device(); - if (!dev->hotkey_dev) { - pr_info("Unable to register input device\n"); + if (!dev->hotkey_dev) return -ENOMEM; - } dev->hotkey_dev->name = "Toshiba input device"; dev->hotkey_dev->phys = "toshiba_acpi/input0"; |