5 files changed, 85 insertions, 31 deletions

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index c1cb94e9f242..7e912f21fd36 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -155,9 +155,6 @@ static int generic_probe(struct usb_device *udev)
 {
         int err, c;
 
-        /* put device-specific files into sysfs */
-        usb_create_sysfs_dev_files(udev);
-
         /* Choose and set the configuration.  This registers the interfaces
          * with the driver core and lets interface drivers bind to them.
          */
@@ -189,8 +186,6 @@ static void generic_disconnect(struct usb_device *udev)
          * unconfigure the device */
         if (udev->actconfig)
                 usb_set_configuration(udev, -1);
-
-        usb_remove_sysfs_dev_files(udev);
 }
 
 #ifdef  CONFIG_PM
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 1e4b81e9eb50..a0bf5df6cb6f 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -213,6 +213,8 @@ struct hc_driver {
 
                 /* force handover of high-speed port to full-speed companion */
         void    (*relinquish_port)(struct usb_hcd *, int);
+                /* has a port been handed over to a companion? */
+        int     (*port_handed_over)(struct usb_hcd *, int);
 };
 
 extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index eb57fcc701d7..94789be54ca3 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -644,6 +644,48 @@ static void hub_stop(struct usb_hub *hub)
 
 #ifdef CONFIG_PM
 
+/* Try to identify which devices need USB-PERSIST handling */
+static int persistent_device(struct usb_device *udev)
+{
+        int i;
+        int retval;
+        struct usb_host_config *actconfig;
+
+        /* Explicitly not marked persistent? */
+        if (!udev->persist_enabled)
+                return 0;
+
+        /* No active config? */
+        actconfig = udev->actconfig;
+        if (!actconfig)
+                return 0;
+
+        /* FIXME! We should check whether it's open here or not! */
+
+        /*
+         * Check that all the interface drivers have a
+         * 'reset_resume' entrypoint
+         */
+        retval = 0;
+        for (i = 0; i < actconfig->desc.bNumInterfaces; i++) {
+                struct usb_interface *intf;
+                struct usb_driver *driver;
+
+                intf = actconfig->interface[i];
+                if (!intf->dev.driver)
+                        continue;
+                driver = to_usb_driver(intf->dev.driver);
+                if (!driver->reset_resume)
+                        return 0;
+                /*
+                 * We have at least one driver, and that one
+                 * has a reset_resume method.
+                 */
+                retval = 1;
+        }
+        return retval;
+}
+
 static void hub_restart(struct usb_hub *hub, int type)
 {
         struct usb_device *hdev = hub->hdev;
@@ -689,8 +731,8 @@ static void hub_restart(struct usb_hub *hub, int type)
                  * turn off the various status changes to prevent
                  * khubd from disconnecting it later.
                  */
-                if (udev->persist_enabled && status == 0 &&
-                                !(portstatus & USB_PORT_STAT_ENABLE)) {
+                if (status == 0 && !(portstatus & USB_PORT_STAT_ENABLE) &&
+                                persistent_device(udev)) {
                         if (portchange & USB_PORT_STAT_C_ENABLE)
                                 clear_port_feature(hub->hdev, port1,
                                                 USB_PORT_FEAT_C_ENABLE);
@@ -1326,6 +1368,12 @@ void usb_disconnect(struct usb_device **pdev)
 
         usb_unlock_device(udev);
 
+        /* Remove the device-specific files from sysfs.  This must be
+         * done with udev unlocked, because some of the attribute
+         * routines try to acquire the device lock.
+         */
+        usb_remove_sysfs_dev_files(udev);
+
         /* Unregister the device.  The device driver is responsible
          * for removing the device files from usbfs and sysfs and for
          * de-configuring the device.
@@ -1541,6 +1589,9 @@ int usb_new_device(struct usb_device *udev)
                 goto fail;
         }
 
+        /* put device-specific files into sysfs */
+        usb_create_sysfs_dev_files(udev);
+
         /* Tell the world! */
         announce_device(udev);
         return err;
@@ -2744,7 +2795,11 @@ loop:
                 if ((status == -ENOTCONN) || (status == -ENOTSUPP))
                         break;
         }
-        dev_err(hub_dev, "unable to enumerate USB device on port %d\n", port1);
+        if (hub->hdev->parent ||
+                        !hcd->driver->port_handed_over ||
+                        !(hcd->driver->port_handed_over)(hcd, port1))
+                dev_err(hub_dev, "unable to enumerate USB device on port %d\n",
+                                port1);
  
 done:
         hub_port_disable(hub, port1, 1);
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 2e2019390290..3da1ab4b389d 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -47,6 +47,10 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Edirol SD-20 */
         { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* Avision AV600U */
+        { USB_DEVICE(0x0638, 0x0a13), .driver_info =
+          USB_QUIRK_STRING_FETCH_255 },
+
         /* M-Systems Flash Disk Pioneers */
         { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
 
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index c783cb111847..5e1f5d55bf04 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -588,35 +588,33 @@ read_descriptors(struct kobject *kobj, struct bin_attribute *attr,
                         container_of(kobj, struct device, kobj));
         size_t nleft = count;
         size_t srclen, n;
+        int cfgno;
+        void *src;
 
-        usb_lock_device(udev);
-
-        /* The binary attribute begins with the device descriptor */
-        srclen = sizeof(struct usb_device_descriptor);
-        if (off < srclen) {
-                n = min_t(size_t, nleft, srclen - off);
-                memcpy(buf, off + (char *) &udev->descriptor, n);
-                nleft -= n;
-                buf += n;
-                off = 0;
-        } else {
-                off -= srclen;
-        }
-
-        /* Then follows the raw descriptor entry for the current
-         * configuration (config plus subsidiary descriptors).
+        /* The binary attribute begins with the device descriptor.
+         * Following that are the raw descriptor entries for all the
+         * configurations (config plus subsidiary descriptors).
          */
-        if (udev->actconfig) {
-                int cfgno = udev->actconfig - udev->config;
-
-                srclen = __le16_to_cpu(udev->actconfig->desc.wTotalLength);
+        for (cfgno = -1; cfgno < udev->descriptor.bNumConfigurations &&
+                        nleft > 0; ++cfgno) {
+                if (cfgno < 0) {
+                        src = &udev->descriptor;
+                        srclen = sizeof(struct usb_device_descriptor);
+                } else {
+                        src = udev->rawdescriptors[cfgno];
+                        srclen = __le16_to_cpu(udev->config[cfgno].desc.
+                                        wTotalLength);
+                }
                 if (off < srclen) {
-                        n = min_t(size_t, nleft, srclen - off);
-                        memcpy(buf, off + udev->rawdescriptors[cfgno], n);
+                        n = min(nleft, srclen - (size_t) off);
+                        memcpy(buf, src + off, n);
                         nleft -= n;
+                        buf += n;
+                        off = 0;
+                } else {
+                        off -= srclen;
                 }
         }
-        usb_unlock_device(udev);
         return count - nleft;
 }