Re: Fwd: [linux-usb-devel] autosuspend for appletouch driver

Am Mittwoch 26 September 2007 schrieb Dmitry Torokhov:
> Guys,
> 
> Have you seen this? Is anyone willingto give this patch a try?

And promptly I see a bug. Please try this code. I don't understand why the
original even compiled.

	Regards
		Oliver
----

--- a/drivers/input/mouse/appletouch.c	2007-09-20 14:14:46.000000000 +0200
+++ b/drivers/input/mouse/appletouch.c	2007-09-27 08:22:13.000000000 +0200
@@ -140,6 +140,7 @@ MODULE_DEVICE_TABLE (usb, atp_table);
 struct atp {
 	char			phys[64];
 	struct usb_device *	udev;		/* usb device */
+	struct usb_interface *	intf;		/* usb interface */
 	struct urb *		urb;		/* usb request block */
 	signed char *		data;		/* transferred data */
 	int			open;		/* non-zero if opened */
@@ -324,6 +325,11 @@ static inline void atp_report_fingers(st
 	input_report_key(input, BTN_TOOL_TRIPLETAP, fingers > 2);
 }
 
+static void atp_mark_busy(struct atp *dev)
+{
+	usb_mark_last_busy(dev->udev);
+}
+
 static void atp_complete(struct urb* urb)
 {
 	int x, y, x_z, y_z, x_f, y_f;
@@ -362,6 +368,9 @@ static void atp_complete(struct urb* urb
 		goto exit;
 	}
 
+	/* mark busy for autosuspend purposes */
+	atp_mark_busy(dev);
+
 	/* reorder the sensors values */
 	if (atp_is_geyser_3(dev)) {
 		memset(dev->xy_cur, 0, sizeof(dev->xy_cur));
@@ -528,12 +537,20 @@ exit:
 static int atp_open(struct input_dev *input)
 {
 	struct atp *dev = input_get_drvdata(input);
+	int rv = 0;
 
-	if (usb_submit_urb(dev->urb, GFP_ATOMIC))
+	if (usb_autopm_get_interface(dev->intf) < 0)
 		return -EIO;
+	dev->intf->needs_remote_wakeup = 1;
+	if (usb_submit_urb(dev->urb, GFP_KERNEL)) {
+		rv = -EIO;
+		dev->intf->needs_remote_wakeup = 0;
+		goto err;
 
 	dev->open = 1;
-	return 0;
+err:
+	usb_autopm_put_interface(dev->intf);
+	return rv;
 }
 
 static void atp_close(struct input_dev *input)
@@ -543,6 +560,7 @@ static void atp_close(struct input_dev *
 	usb_kill_urb(dev->urb);
 	cancel_work_sync(&dev->work);
 	dev->open = 0;
+	dev->intf->needs_remote_wakeup = 0;
 }
 
 static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id)
@@ -580,6 +598,7 @@ static int atp_probe(struct usb_interfac
 	}
 
 	dev->udev = udev;
+	dev->intf = iface;
 	dev->input = input_dev;
 	dev->overflowwarn = 0;
 	if (atp_is_geyser_3(dev))
@@ -714,7 +733,7 @@ static int atp_resume(struct usb_interfa
 {
 	struct atp *dev = usb_get_intfdata(iface);
 
-	if (dev->open && usb_submit_urb(dev->urb, GFP_ATOMIC))
+	if (dev->open && usb_submit_urb(dev->urb, GFP_NOIO))
 		return -EIO;
 
 	return 0;
@@ -727,6 +746,7 @@ static struct usb_driver atp_driver = {
 	.suspend	= atp_suspend,
 	.resume		= atp_resume,
 	.id_table	= atp_table,
+	.supports_autosuspend = 1,
 };
 
 static int __init atp_init(void)