Merge branch 'bugzilla-13865' into release

This commit is contained in:
Len Brown 2009-08-02 11:33:01 -04:00
commit 437f8c8ab9
1 changed files with 7 additions and 5 deletions

View File

@ -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());
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;
}