Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block

[pandora-kernel.git] / drivers / usb / misc / idmouse.c

diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index 6da8887..1337a9c 100644 (file)
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -96,6 +96,8 @@ static int idmouse_probe(struct usb_interface *interface,
                                const struct usb_device_id *id);
 
 static void idmouse_disconnect(struct usb_interface *interface);
+static int idmouse_suspend(struct usb_interface *intf, pm_message_t message);
+static int idmouse_resume(struct usb_interface *intf);
 
 /* file operation pointers */
 static const struct file_operations idmouse_fops = {
@@ -117,7 +119,11 @@ static struct usb_driver idmouse_driver = {
        .name = DRIVER_SHORT,
        .probe = idmouse_probe,
        .disconnect = idmouse_disconnect,
+       .suspend = idmouse_suspend,
+       .resume = idmouse_resume,
+       .reset_resume = idmouse_resume,
        .id_table = idmouse_table,
+       .supports_autosuspend = 1,
 };
 
 static int idmouse_create_image(struct usb_idmouse *dev)
@@ -197,6 +203,17 @@ reset:
        return result;
 }
 
+/* PM operations are nops as this driver does IO only during open() */
+static int idmouse_suspend(struct usb_interface *intf, pm_message_t message)
+{
+       return 0;
+}
+
+static int idmouse_resume(struct usb_interface *intf)
+{
+       return 0;
+}
+
 static inline void idmouse_delete(struct usb_idmouse *dev)
 {
        kfree(dev->bulk_in_buffer);
@@ -235,9 +252,13 @@ static int idmouse_open(struct inode *inode, struct file *file)
        } else {
 
                /* create a new image and check for success */
+               result = usb_autopm_get_interface(interface);
+               if (result)
+                       goto error;
                result = idmouse_create_image (dev);
                if (result)
                        goto error;
+               usb_autopm_put_interface(interface);
 
                /* increment our usage count for the driver */
                ++dev->open;