From f660513d89c7cf83987f3bde386fa1b770eb6b19 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 20 Jul 2010 15:19:51 -0700
Subject: [PATCH] --- yaml --- r: 202479 b: refs/heads/master c:
 bc28596a8fe5034ef776b0be2e0bf5629a31f746 h: refs/heads/master i:   202477:
 b3743926a27b0c129baded5a27f4998b1c7f5e10   202475:
 3e4cc5c7004098cedb5c17d397f34e6d26195112   202471:
 4a73950664081979f05dd423cab6dedc7aeb92c8   202463:
 69d7d140108236982b30fb17d804935aaa1c5aed v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/platform/x86/hp-wmi.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6cf8c5bca732..032b1735ecbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bd1ca1f4ce99c5be041bfc2997e394cdb5240dc
+refs/heads/master: bc28596a8fe5034ef776b0be2e0bf5629a31f746
diff --git a/trunk/drivers/platform/x86/hp-wmi.c b/trunk/drivers/platform/x86/hp-wmi.c
index 34b417848e29..c5f95d1e0315 100644
--- a/trunk/drivers/platform/x86/hp-wmi.c
+++ b/trunk/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";