[PATCH V3] input: Fix USB autosuspend on bcm5974
From: Matthew Garrett <hidden>
Date: 2011-10-10 15:47:01
Subsystem:
apple bcm5974 multitouch driver, input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Henrik Rydberg, Dmitry Torokhov, Linus Torvalds
The bcm5974 code takes a USB autosuspend reference on device open and releases it on device close. This means that the hardware won't sleep when anything holds it open. This is sensible for input devices that don't support remote wakeups on normal use (like most mice), but this hardware trigger wakeups on touch and so can suspend transparently to the user. Doing so allows the USB host controller to sleep when the machine is idle, giving measurable power savings. Signed-off-by: Matthew Garrett <redacted> --- Correctly flag needs_remote_wake. drivers/input/mouse/bcm5974.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 5ec617e..4ca5523 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c@@ -631,6 +631,7 @@ static void bcm5974_irq_button(struct urb *urb) switch (urb->status) { case 0: + usb_mark_last_busy(dev->udev); break; case -EOVERFLOW: case -ECONNRESET:
@@ -660,6 +661,7 @@ static void bcm5974_irq_trackpad(struct urb *urb) switch (urb->status) { case 0: + usb_mark_last_busy(dev->udev); break; case -EOVERFLOW: case -ECONNRESET:
@@ -764,8 +766,7 @@ static int bcm5974_open(struct input_dev *input) mutex_unlock(&dev->pm_mutex); - if (error) - usb_autopm_put_interface(dev->intf); + usb_autopm_put_interface(dev->intf); return error; }
@@ -780,8 +781,6 @@ static void bcm5974_close(struct input_dev *input) dev->opened = 0; mutex_unlock(&dev->pm_mutex); - - usb_autopm_put_interface(dev->intf); } static int bcm5974_suspend(struct usb_interface *iface, pm_message_t message)
@@ -870,6 +869,9 @@ static int bcm5974_probe(struct usb_interface *iface, dev->tp_data, dev->cfg.tp_datalen, bcm5974_irq_trackpad, dev, 1); + /* Required for autosuspend */ + iface->needs_remote_wakeup = 1; + /* create bcm5974 device */ usb_make_path(udev, dev->phys, sizeof(dev->phys)); strlcat(dev->phys, "/input0", sizeof(dev->phys));
--
1.7.6.4