瀏覽代碼

hp-wmi: Fix mixing up of and/or directive

This should have been an "and". Additionally checking for !obj
is even better.

Signed-off-by: Thomas Renninger <trenn@suse.de>
CC: linux-acpi@vger.kernel.or
CC: platform-driver-x86@vger.kernel.org
CC: mjg@redhat.com
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Thomas Renninger 15 年之前
父節點
當前提交
c4775062d5
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/platform/x86/hp-wmi.c

+ 3 - 1
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;
 	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",
 		printk(KERN_INFO "hp-wmi: Unknown response received %d\n",
 		       obj->type);
 		       obj->type);
 		kfree(obj);
 		kfree(obj);