Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux.git] / drivers / usb / core / usb.c

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 60ef4ef0101ae727567ec07bdd82d5b73cbf102e..e4df9edf1bc02bcfaa65f96f74730cb37f1e65bd 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -33,6 +33,7 @@
 #include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 #include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>

+#include <linux/workqueue.h>

 
 #include <asm/io.h>
 #include <asm/scatterlist.h>
 
 #include <asm/io.h>
 #include <asm/scatterlist.h>


@@ -47,6 +48,8 @@ const char *usbcore_name = "usbcore";
 
 static int nousb;      /* Disable USB when built into kernel image */
 
 
 static int nousb;      /* Disable USB when built into kernel image */
 

+struct workqueue_struct *ksuspend_usb_wq;      /* For autosuspend */
+

 
 /**
  * usb_ifnum_to_if - get the interface object with a given interface number
 
 /**
  * usb_ifnum_to_if - get the interface object with a given interface number


@@ -170,9 +173,9 @@ static void usb_release_dev(struct device *dev)
 
        udev = to_usb_device(dev);
 
 
        udev = to_usb_device(dev);
 

-#ifdef CONFIG_PM
+#ifdef CONFIG_USB_SUSPEND

        cancel_delayed_work(&udev->autosuspend);
        cancel_delayed_work(&udev->autosuspend);

-       flush_scheduled_work();
+       flush_workqueue(ksuspend_usb_wq);

 #endif
        usb_destroy_configuration(udev);
        usb_put_hcd(bus_to_hcd(udev->bus));
 #endif
        usb_destroy_configuration(udev);
        usb_put_hcd(bus_to_hcd(udev->bus));


@@ -184,17 +187,44 @@ static void usb_release_dev(struct device *dev)
 
 #ifdef CONFIG_PM
 
 
 #ifdef CONFIG_PM
 

+static int ksuspend_usb_init(void)
+{
+       ksuspend_usb_wq = create_singlethread_workqueue("ksuspend_usbd");
+       if (!ksuspend_usb_wq)
+               return -ENOMEM;
+       return 0;
+}
+
+static void ksuspend_usb_cleanup(void)
+{
+       destroy_workqueue(ksuspend_usb_wq);
+}
+
+#else
+
+#define ksuspend_usb_init()    0
+#define ksuspend_usb_cleanup() do {} while (0)
+
+#endif
+
+#ifdef CONFIG_USB_SUSPEND
+

 /* usb_autosuspend_work - callback routine to autosuspend a USB device */
 static void usb_autosuspend_work(void *_udev)
 {
        struct usb_device       *udev = _udev;
 
 /* usb_autosuspend_work - callback routine to autosuspend a USB device */
 static void usb_autosuspend_work(void *_udev)
 {
        struct usb_device       *udev = _udev;
 

-       mutex_lock_nested(&udev->pm_mutex, udev->level);
+       usb_pm_lock(udev);

        udev->auto_pm = 1;
        usb_suspend_both(udev, PMSG_SUSPEND);
        udev->auto_pm = 1;
        usb_suspend_both(udev, PMSG_SUSPEND);

-       mutex_unlock(&udev->pm_mutex);
+       usb_pm_unlock(udev);

 }
 
 }
 

+#else
+
+static void usb_autosuspend_work(void *_udev)
+{}
+

 #endif
 
 /**
 #endif
 
 /**


@@ -976,9 +1006,12 @@ static int __init usb_init(void)
                return 0;
        }
 
                return 0;
        }
 

+       retval = ksuspend_usb_init();
+       if (retval)
+               goto out;

        retval = bus_register(&usb_bus_type);
        if (retval) 
        retval = bus_register(&usb_bus_type);
        if (retval) 

-               goto out;
+               goto bus_register_failed;

        retval = usb_host_init();
        if (retval)
                goto host_init_failed;
        retval = usb_host_init();
        if (retval)
                goto host_init_failed;


@@ -1014,6 +1047,8 @@ major_init_failed:
        usb_host_cleanup();
 host_init_failed:
        bus_unregister(&usb_bus_type);
        usb_host_cleanup();
 host_init_failed:
        bus_unregister(&usb_bus_type);

+bus_register_failed:
+       ksuspend_usb_cleanup();

 out:
        return retval;
 }
 out:
        return retval;
 }


@@ -1035,6 +1070,7 @@ static void __exit usb_exit(void)
        usb_hub_cleanup();
        usb_host_cleanup();
        bus_unregister(&usb_bus_type);
        usb_hub_cleanup();
        usb_host_cleanup();
        bus_unregister(&usb_bus_type);

+       ksuspend_usb_cleanup();

 }
 
 subsys_initcall(usb_init);
 }
 
 subsys_initcall(usb_init);