Commit 300837ee authored by Henrik Rydberg's avatar Henrik Rydberg Committed by james toy

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: default avatarHenrik Rydberg <rydberg@euromail.se>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 78f7b01f
...@@ -761,7 +761,6 @@ static struct usb_driver bcm5974_driver = { ...@@ -761,7 +761,6 @@ static struct usb_driver bcm5974_driver = {
.disconnect = bcm5974_disconnect, .disconnect = bcm5974_disconnect,
.suspend = bcm5974_suspend, .suspend = bcm5974_suspend,
.resume = bcm5974_resume, .resume = bcm5974_resume,
.reset_resume = bcm5974_resume,
.id_table = bcm5974_table, .id_table = bcm5974_table,
.supports_autosuspend = 1, .supports_autosuspend = 1,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment