1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 4ac2311c00af..a2ad53e15874 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -171,7 +171,7 @@ static int hp_wmi_tablet_state(void)
 static int hp_wmi_set_block(void *data, bool blocked)
 {
         unsigned long b = (unsigned long) data;
-        int query = BIT(b + 8) | ((!!blocked) << b);
+        int query = BIT(b + 8) | ((!blocked) << b);
 
         return hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, query);
 }
@@ -520,11 +520,13 @@ static int hp_wmi_resume_handler(struct platform_device *device)
          * the input layer will only actually pass it on if the state
          * changed.
          */
-
-        input_report_switch(hp_wmi_input_dev, SW_DOCK, hp_wmi_dock_state());
-        input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
-                            hp_wmi_tablet_state());
-        input_sync(hp_wmi_input_dev);
+        if (hp_wmi_input_dev) {
+                input_report_switch(hp_wmi_input_dev, SW_DOCK,
+                                    hp_wmi_dock_state());
+                input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
+                                    hp_wmi_tablet_state());
+                input_sync(hp_wmi_input_dev);
+        }
 
         return 0;
 }