1 files changed, 29 insertions, 15 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 975d7c1288e3..94d22551fc1b 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1878,23 +1878,10 @@ rescan:
                 /* kick hcd */
                 unlink1(hcd, urb, -ESHUTDOWN);
                 dev_dbg (hcd->self.controller,
-                        "shutdown urb %pK ep%d%s%s\n",
+                        "shutdown urb %pK ep%d%s-%s\n",
                         urb, usb_endpoint_num(&ep->desc),
                         is_in ? "in" : "out",
-                        ({      char *s;
-
-                                 switch (usb_endpoint_type(&ep->desc)) {
-                                 case USB_ENDPOINT_XFER_CONTROL:
-                                        s = ""; break;
-                                 case USB_ENDPOINT_XFER_BULK:
-                                        s = "-bulk"; break;
-                                 case USB_ENDPOINT_XFER_INT:
-                                        s = "-intr"; break;
-                                 default:
-                                        s = "-iso"; break;
-                                };
-                                s;
-                        }));
+                        usb_ep_type_string(usb_endpoint_type(&ep->desc)));
                 usb_put_urb (urb);
 
                 /* list contents may have changed */
@@ -2448,6 +2435,19 @@ EXPORT_SYMBOL_GPL(usb_hcd_irq);
 
 /*-------------------------------------------------------------------------*/
 
+/* Workqueue routine for when the root-hub has died. */
+static void hcd_died_work(struct work_struct *work)
+{
+        struct usb_hcd *hcd = container_of(work, struct usb_hcd, died_work);
+        static char *env[] = {
+                "ERROR=DEAD",
+                NULL
+        };
+
+        /* Notify user space that the host controller has died */
+        kobject_uevent_env(&hcd->self.root_hub->dev.kobj, KOBJ_OFFLINE, env);
+}
+
 /**
  * usb_hc_died - report abnormal shutdown of a host controller (bus glue)
  * @hcd: pointer to the HCD representing the controller
@@ -2488,6 +2488,13 @@ void usb_hc_died (struct usb_hcd *hcd)
                         usb_kick_hub_wq(hcd->self.root_hub);
                 }
         }
+
+        /* Handle the case where this function gets called with a shared HCD */
+        if (usb_hcd_is_primary_hcd(hcd))
+                schedule_work(&hcd->died_work);
+        else
+                schedule_work(&hcd->primary_hcd->died_work);
+
         spin_unlock_irqrestore (&hcd_root_hub_lock, flags);
         /* Make sure that the other roothub is also deallocated. */
 }
@@ -2555,6 +2562,8 @@ struct usb_hcd *__usb_create_hcd(const struct hc_driver *driver,
         INIT_WORK(&hcd->wakeup_work, hcd_resume_work);
 #endif
 
+        INIT_WORK(&hcd->died_work, hcd_died_work);
+
         hcd->driver = driver;
         hcd->speed = driver->flags & HCD_MASK;
         hcd->product_desc = (driver->product_desc) ? driver->product_desc :
@@ -2908,6 +2917,7 @@ error_create_attr_group:
 #ifdef CONFIG_PM
         cancel_work_sync(&hcd->wakeup_work);
 #endif
+        cancel_work_sync(&hcd->died_work);
         mutex_lock(&usb_bus_idr_lock);
         usb_disconnect(&rhdev);         /* Sets rhdev to NULL */
         mutex_unlock(&usb_bus_idr_lock);
@@ -2968,6 +2978,7 @@ void usb_remove_hcd(struct usb_hcd *hcd)
 #ifdef CONFIG_PM
         cancel_work_sync(&hcd->wakeup_work);
 #endif
+        cancel_work_sync(&hcd->died_work);
 
         mutex_lock(&usb_bus_idr_lock);
         usb_disconnect(&rhdev);         /* Sets rhdev to NULL */
@@ -3020,6 +3031,9 @@ usb_hcd_platform_shutdown(struct platform_device *dev)
 {
         struct usb_hcd *hcd = platform_get_drvdata(dev);
 
+        /* No need for pm_runtime_put(), we're shutting down */
+        pm_runtime_get_sync(&dev->dev);
+
         if (hcd->driver->shutdown)
                 hcd->driver->shutdown(hcd);
 }