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 <[email protected]>
CC: [email protected]
CC: [email protected]
CC: [email protected]
Signed-off-by: Matthew Garrett <[email protected]>

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index c5f95d1e0315bd416bea0e127e9ee84ea1b3645b..7e8a136b025b3e289ba44033e0ea0fec85df61eb 100644 (file)
--- a/drivers/platform/x86/hp-wmi.c
+++ b/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);