diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-20 08:59:04 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 08:59:30 -0800 |
| commit | 490b929d42d2a321887f9538a83fc9f215675f15 (patch) | |
| tree | 04fe7161f92c568839605f92c8f1c8730216f739 /drivers/platform/x86/topstar-laptop.c | |
| parent | 23621799f24c3c4e8e8dcdf5fdeb3ebd2be148f9 (diff) | |
| parent | ef43eff3447f30b4a3cfc61813902c2e57c20245 (diff) | |
| download | linux-490b929d42d2a321887f9538a83fc9f215675f15.tar.bz2 | |
Merge branch 'efm32/soc' into next/soc
From Uwe Kleine-König:
* efm32/soc: (1003 commits)
ARM: device trees for Energy Micro's EFM32 Cortex-M3 SoCs
ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs
+Linux 3.13-rc4
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'drivers/platform/x86/topstar-laptop.c')
| -rw-r--r-- | drivers/platform/x86/topstar-laptop.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c index 67897c8740ba..e597de05e6c2 100644 --- a/drivers/platform/x86/topstar-laptop.c +++ b/drivers/platform/x86/topstar-laptop.c @@ -97,10 +97,8 @@ static int acpi_topstar_init_hkey(struct topstar_hkey *hkey) int error; input = input_allocate_device(); - if (!input) { - pr_err("Unable to allocate input device\n"); + if (!input) return -ENOMEM; - } input->name = "Topstar Laptop extra buttons"; input->phys = "topstar/input0"; |