1 files changed, 29 insertions, 41 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 590ec82d0515..bde29ab2b504 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -44,6 +44,7 @@ struct usb_hub {
                 struct usb_hub_status   hub;
                 struct usb_port_status  port;
         }                       *status;        /* buffer for status reports */
+        struct mutex            status_mutex;   /* for the status buffer */
 
         int                     error;          /* last reported error */
         int                     nerrors;        /* track consecutive errors */
@@ -118,8 +119,7 @@ MODULE_PARM_DESC(use_both_schemes,
                 "first one fails");
 
 
-#ifdef  DEBUG
-static inline char *portspeed (int portstatus)
+static inline char *portspeed(int portstatus)
 {
         if (portstatus & (1 << USB_PORT_FEAT_HIGHSPEED))
                 return "480 Mb/s";
@@ -128,7 +128,6 @@ static inline char *portspeed (int portstatus)
         else
                 return "12 Mb/s";
 }
-#endif
 
 /* Note that hdev or one of its children must be locked! */
 static inline struct usb_hub *hdev_to_hub(struct usb_device *hdev)
@@ -535,6 +534,7 @@ static int hub_hub_status(struct usb_hub *hub,
 {
         int ret;
 
+        mutex_lock(&hub->status_mutex);
         ret = get_hub_status(hub->hdev, &hub->status->hub);
         if (ret < 0)
                 dev_err (hub->intfdev,
@@ -544,6 +544,7 @@ static int hub_hub_status(struct usb_hub *hub,
                 *change = le16_to_cpu(hub->status->hub.wHubChange); 
                 ret = 0;
         }
+        mutex_unlock(&hub->status_mutex);
         return ret;
 }
 
@@ -617,6 +618,7 @@ static int hub_configure(struct usb_hub *hub,
                 ret = -ENOMEM;
                 goto fail;
         }
+        mutex_init(&hub->status_mutex);
 
         hub->descriptor = kmalloc(sizeof(*hub->descriptor), GFP_KERNEL);
         if (!hub->descriptor) {
@@ -1277,11 +1279,8 @@ int usb_new_device(struct usb_device *udev)
 {
         int err;
 
-        /* Lock ourself into memory in order to keep a probe sequence
-         * sleeping in a new thread from allowing us to be unloaded.
-         */
-        if (!try_module_get(THIS_MODULE))
-                return -EINVAL;
+        /* Determine quirks */
+        usb_detect_quirks(udev);
 
         err = usb_get_configuration(udev);
         if (err < 0) {
@@ -1368,11 +1367,15 @@ int usb_new_device(struct usb_device *udev)
         }
 #endif
 
+        /* export the usbdev device-node for libusb */
+        udev->dev.devt = MKDEV(USB_DEVICE_MAJOR,
+                        (((udev->bus->busnum-1) * 128) + (udev->devnum-1)));
+
         /* Register the device.  The device driver is responsible
-         * for adding the device files to usbfs and sysfs and for
-         * configuring the device.
+         * for adding the device files to sysfs and for configuring
+         * the device.
          */
-        err = device_add (&udev->dev);
+        err = device_add(&udev->dev);
         if (err) {
                 dev_err(&udev->dev, "can't device_add, error %d\n", err);
                 goto fail;
@@ -1383,7 +1386,6 @@ int usb_new_device(struct usb_device *udev)
                 usb_autoresume_device(udev->parent);
 
 exit:
-        module_put(THIS_MODULE);
         return err;
 
 fail:
@@ -1396,6 +1398,7 @@ static int hub_port_status(struct usb_hub *hub, int port1,
 {
         int ret;
 
+        mutex_lock(&hub->status_mutex);
         ret = get_port_status(hub->hdev, port1, &hub->status->port);
         if (ret < 4) {
                 dev_err (hub->intfdev,
@@ -1407,6 +1410,7 @@ static int hub_port_status(struct usb_hub *hub, int port1,
                 *change = le16_to_cpu(hub->status->port.wPortChange); 
                 ret = 0;
         }
+        mutex_unlock(&hub->status_mutex);
         return ret;
 }
 
@@ -1855,12 +1859,8 @@ static int remote_wakeup(struct usb_device *udev)
         usb_lock_device(udev);
         if (udev->state == USB_STATE_SUSPENDED) {
                 dev_dbg(&udev->dev, "usb %sresume\n", "wakeup-");
-                status = usb_autoresume_device(udev);
-
-                /* Give the interface drivers a chance to do something,
-                 * then autosuspend the device again. */
-                if (status == 0)
-                        usb_autosuspend_device(udev);
+                usb_mark_last_busy(udev);
+                status = usb_external_resume_device(udev);
         }
         usb_unlock_device(udev);
         return status;
@@ -1904,6 +1904,7 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
         struct usb_hub          *hub = usb_get_intfdata (intf);
         struct usb_device       *hdev = hub->hdev;
         unsigned                port1;
+        int                     status = 0;
 
         /* fail if children aren't already suspended */
         for (port1 = 1; port1 <= hdev->maxchild; port1++) {
@@ -1927,24 +1928,18 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
 
         dev_dbg(&intf->dev, "%s\n", __FUNCTION__);
 
+        /* stop khubd and related activity */
+        hub_quiesce(hub);
+
         /* "global suspend" of the downstream HC-to-USB interface */
         if (!hdev->parent) {
-                struct usb_bus  *bus = hdev->bus;
-                if (bus) {
-                        int     status = hcd_bus_suspend (bus);
-
-                        if (status != 0) {
-                                dev_dbg(&hdev->dev, "'global' suspend %d\n",
-                                        status);
-                                return status;
-                        }
-                } else
-                        return -EOPNOTSUPP;
+                status = hcd_bus_suspend(hdev->bus);
+                if (status != 0) {
+                        dev_dbg(&hdev->dev, "'global' suspend %d\n", status);
+                        hub_activate(hub);
+                }
         }
-
-        /* stop khubd and related activity */
-        hub_quiesce(hub);
-        return 0;
+        return status;
 }
 
 static int hub_resume(struct usb_interface *intf)
@@ -1989,13 +1984,6 @@ static inline int remote_wakeup(struct usb_device *udev)
 #define hub_resume NULL
 #endif
 
-void usb_resume_root_hub(struct usb_device *hdev)
-{
-        struct usb_hub *hub = hdev_to_hub(hdev);
-
-        kick_khubd(hub);
-}
-
 
 /* USB 2.0 spec, 7.1.7.3 / fig 7-29:
  *
@@ -2439,7 +2427,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
 
         if (portchange & USB_PORT_STAT_C_CONNECTION) {
                 status = hub_port_debounce(hub, port1);
-                if (status < 0) {
+                if (status < 0 && printk_ratelimit()) {
                         dev_err (hub_dev,
                                 "connect-debounce failed, port %d disabled\n",
                                 port1);