diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2010-03-20 00:06:40 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-20 00:08:20 -0700 |
commit | d90e6f6aad0ffdc674bc3a05c85c40dcc18e604c (patch) | |
tree | 5c1b4d09768ccdf68e588bec23bac6d5ebed1529 | |
parent | 88fcf710c13bd41f2b98c5411e4f21ab98da4fb4 (diff) | |
download | linux-d90e6f6aad0ffdc674bc3a05c85c40dcc18e604c.tar.gz |
Input: bcm5974 - retract efi-broken suspend_resume
With the recent system-wide improvements on suspend/resume and EFI booting the suspend_resume method of the bcm5974 has broken. When waking up from the S3 state on the MacBookAir, the trackpad is found in a yet unknown state, unable to switch to the proper multitouch mode. The result is a frozen touchpad, and a flood of errors of the kind bcm5974: bad trackpad package, length: 8. This patch retracts the reset_resume method altogether, falling back on the generic unbind/rebind functionality of the usb layer until further investigations can be made as how to reset the device when booting from efi. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/mouse/bcm5974.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 4f8fe0886b2a..b89879bd860f 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -803,7 +803,6 @@ static struct usb_driver bcm5974_driver = { .disconnect = bcm5974_disconnect, .suspend = bcm5974_suspend, .resume = bcm5974_resume, - .reset_resume = bcm5974_resume, .id_table = bcm5974_table, .supports_autosuspend = 1, }; |