diff options
| author | Len Brown <len.brown@intel.com> | 2009-08-02 17:33:01 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-08-02 17:33:01 +0200 |
| commit | 437f8c8ab99e7b6eed8e0d6d9cf46085c8de2e36 (patch) | |
| tree | 7670bf6f2afc441974d37951afdc5c598705afef /drivers/platform | |
| parent | Merge branch 'bugzilla-13620-revert' into release (diff) | |
| parent | hp-wmi: check that an input device exists in resume handler (diff) | |
| download | linux-437f8c8ab99e7b6eed8e0d6d9cf46085c8de2e36.tar.xz linux-437f8c8ab99e7b6eed8e0d6d9cf46085c8de2e36.zip | |
Merge branch 'bugzilla-13865' into release
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index ca508564a181..a2ad53e15874 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -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; } |