summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-07-21 00:19:51 +0200
committerMatthew Garrett <mjg@redhat.com>2010-08-03 15:49:02 +0200
commitbc28596a8fe5034ef776b0be2e0bf5629a31f746 (patch)
treecfc5b39c733cdfe111c60c906b3948887905723c
parenttoshiba_acpi: make remove_device() and add_device() void (diff)
downloadlinux-bc28596a8fe5034ef776b0be2e0bf5629a31f746.tar.xz
linux-bc28596a8fe5034ef776b0be2e0bf5629a31f746.zip
hp-wmi: add return value checking for input_allocate_device()
Add error checking and return -ENOMEM if input_allocate_device() fail. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Thomas Renninger <trenn@suse.de> Cc: Matthew Garrett <mjg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r--drivers/platform/x86/hp-wmi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 34b417848e29..c5f95d1e0315 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -527,6 +527,8 @@ static int __init hp_wmi_input_setup(void)
int err;
hp_wmi_input_dev = input_allocate_device();
+ if (!hp_wmi_input_dev)
+ return -ENOMEM;
hp_wmi_input_dev->name = "HP WMI hotkeys";
hp_wmi_input_dev->phys = "wmi/input0";