From 5e91b5f43646ed426b69470733f8b2c285b861a1 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Thu, 29 Jul 2010 12:27:59 +0200
Subject: [PATCH] --- yaml --- r: 202500 b: refs/heads/master c:
 c4775062d57c762de37ff93fb5f8611320c25e2a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dfb325d66e6e..1eb5d95b1492 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4519169b8f096957e4474e9a17206b2026dab0b3
+refs/heads/master: c4775062d57c762de37ff93fb5f8611320c25e2a
diff --git a/trunk/drivers/platform/x86/hp-wmi.c b/trunk/drivers/platform/x86/hp-wmi.c
index c5f95d1e0315..7e8a136b025b 100644
--- a/trunk/drivers/platform/x86/hp-wmi.c
+++ b/trunk/drivers/platform/x86/hp-wmi.c
@@ -434,7 +434,9 @@ static void hp_wmi_notify(u32 value, void *context)
 
 	obj = (union acpi_object *)response.pointer;
 
-	if (obj || obj->type != ACPI_TYPE_BUFFER) {
+	if (!obj)
+		return;
+	if (obj->type != ACPI_TYPE_BUFFER) {
 		printk(KERN_INFO "hp-wmi: Unknown response received %d\n",
 		       obj->type);
 		kfree(obj);