12 files changed, 113 insertions, 20 deletions

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 659b3d9671c4..428b5993575a 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -172,7 +172,6 @@ static struct usb_interface_descriptor rndis_data_intf __initdata = {
         .bDescriptorType =      USB_DT_INTERFACE,
 
         /* .bInterfaceNumber = DYNAMIC */
-        .bAlternateSetting =    1,
         .bNumEndpoints =        2,
         .bInterfaceClass =      USB_CLASS_CDC_DATA,
         .bInterfaceSubClass =   0,
@@ -303,7 +302,7 @@ static void rndis_response_available(void *_rndis)
         __le32                          *data = req->buf;
         int                             status;
 
-        if (atomic_inc_return(&rndis->notify_count))
+        if (atomic_inc_return(&rndis->notify_count) != 1)
                 return;
 
         /* Send RNDIS RESPONSE_AVAILABLE notification; a
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index 1fe8b44787b3..b3408ff39fba 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -2363,6 +2363,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
                 nuke(loop_ep, -ESHUTDOWN);
         spin_unlock_irqrestore(&udc_controller->lock, flags);
 
+        /* report disconnect; the controller is already quiesced */
+        driver->disconnect(&udc_controller->gadget);
+
         /* unbind gadget and unhook driver. */
         driver->unbind(&udc_controller->gadget);
         udc_controller->gadget.dev.driver = NULL;
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 091bb55c9aa7..f3c6703cffda 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -1836,6 +1836,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
                 nuke(loop_ep, -ESHUTDOWN);
         spin_unlock_irqrestore(&udc_controller->lock, flags);
 
+        /* report disconnect; the controller is already quiesced */
+        driver->disconnect(&udc_controller->gadget);
+
         /* unbind gadget and unhook driver. */
         driver->unbind(&udc_controller->gadget);
         udc_controller->gadget.dev.driver = NULL;
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index da6e93c201d2..2dbc0db0b46c 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -141,7 +141,11 @@ static int is_vbus_present(void)
 
         if (mach->gpio_vbus) {
                 int value = gpio_get_value(mach->gpio_vbus);
-                return mach->gpio_vbus_inverted ? !value : value;
+
+                if (mach->gpio_vbus_inverted)
+                        return !value;
+                else
+                        return !!value;
         }
         if (mach->udc_is_connected)
                 return mach->udc_is_connected();
@@ -982,7 +986,7 @@ static int pxa25x_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
         struct pxa25x_udc       *udc;
 
         udc = container_of(_gadget, struct pxa25x_udc, gadget);
-        udc->vbus = (is_active != 0);
+        udc->vbus = is_active;
         DMSG("vbus %s\n", is_active ? "supplied" : "inactive");
         pullup(udc);
         return 0;
@@ -1399,12 +1403,8 @@ lubbock_vbus_irq(int irq, void *_dev)
 static irqreturn_t udc_vbus_irq(int irq, void *_dev)
 {
         struct pxa25x_udc       *dev = _dev;
-        int                     vbus = gpio_get_value(dev->mach->gpio_vbus);
 
-        if (dev->mach->gpio_vbus_inverted)
-                vbus = !vbus;
-
-        pxa25x_udc_vbus_session(&dev->gadget, vbus);
+        pxa25x_udc_vbus_session(&dev->gadget, is_vbus_present());
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index c46a58f9181d..36864f958444 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -66,6 +66,8 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 {
         struct ehci_hcd         *ehci = hcd_to_ehci(hcd);
         struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
+        struct pci_dev          *p_smbus;
+        u8                      rev;
         u32                     temp;
         int                     retval;
 
@@ -166,6 +168,28 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                         pci_write_config_byte(pdev, 0x4b, tmp | 0x20);
                 }
                 break;
+        case PCI_VENDOR_ID_ATI:
+                /* SB600 and old version of SB700 have a bug in EHCI controller,
+                 * which causes usb devices lose response in some cases.
+                 */
+                if ((pdev->device == 0x4386) || (pdev->device == 0x4396)) {
+                        p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,
+                                                 PCI_DEVICE_ID_ATI_SBX00_SMBUS,
+                                                 NULL);
+                        if (!p_smbus)
+                                break;
+                        rev = p_smbus->revision;
+                        if ((pdev->device == 0x4386) || (rev == 0x3a)
+                            || (rev == 0x3b)) {
+                                u8 tmp;
+                                ehci_info(ehci, "applying AMD SB600/SB700 USB "
+                                        "freeze workaround\n");
+                                pci_read_config_byte(pdev, 0x53, &tmp);
+                                pci_write_config_byte(pdev, 0x53, tmp | (1<<3));
+                        }
+                        pci_dev_put(p_smbus);
+                }
+                break;
         }
 
         ehci_reset(ehci);
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index b11798d17ae5..c7d4b5a06bdb 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -183,16 +183,14 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)
          * the async ring; just the I/O watchdog.  Note that if a
          * SHRINK were pending, OFF would never be requested.
          */
-        enum ehci_timer_action oldactions = ehci->actions;
+        if (timer_pending(&ehci->watchdog)
+                        && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))
+                                & ehci->actions))
+                return;
 
         if (!test_and_set_bit (action, &ehci->actions)) {
                 unsigned long t;
 
-                if (timer_pending(&ehci->watchdog)
-                        && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF))
-                                & oldactions))
-                        return;
-
                 switch (action) {
                 case TIMER_IO_WATCHDOG:
                         t = EHCI_IO_JIFFIES;
@@ -208,7 +206,7 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action)
                         t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1;
                         break;
                 }
-                mod_timer(&ehci->watchdog, round_jiffies(t + jiffies));
+                mod_timer(&ehci->watchdog, t + jiffies);
         }
 }
 
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index c9de3f027aab..e06810aef2df 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -687,7 +687,10 @@ static ssize_t mon_bin_read(struct file *file, char __user *buf,
         }
 
         if (rp->b_read >= sizeof(struct mon_bin_hdr)) {
-                step_len = min(nbytes, (size_t)ep->len_cap);
+                step_len = ep->len_cap;
+                step_len -= rp->b_read - sizeof(struct mon_bin_hdr);
+                if (step_len > nbytes)
+                        step_len = nbytes;
                 offset = rp->b_out + PKT_SIZE;
                 offset += rp->b_read - sizeof(struct mon_bin_hdr);
                 if (offset >= rp->b_size)
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index e45e70bcc5e2..cc64462d4c4e 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1757,7 +1757,7 @@ static int musb_schedule(
                 }
         }
         /* use bulk reserved ep1 if no other ep is free */
-        if (best_end > 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
+        if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
                 hw_ep = musb->bulk_ep;
                 if (is_in)
                         head = &musb->in_bulk;
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 5b20de130e08..5b95009d2fbb 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -135,6 +135,7 @@ static int usb_console_setup(struct console *co, char *options)
                                 err("no more memory");
                                 goto reset_open_count;
                         }
+                        kref_init(&tty->kref);
                         termios = kzalloc(sizeof(*termios), GFP_KERNEL);
                         if (!termios) {
                                 retval = -ENOMEM;
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 9035d7256b03..cfaf1f085535 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -56,6 +56,7 @@ static void cp2101_shutdown(struct usb_serial *);
 static int debug;
 
 static struct usb_device_id id_table [] = {
+        { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */
         { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
         { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */
         { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 6fa1ec441b61..809697b3c7fc 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -224,6 +224,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 #define ONDA_VENDOR_ID                          0x19d2
 #define ONDA_PRODUCT_MSA501HS                   0x0001
 #define ONDA_PRODUCT_ET502HS                    0x0002
+#define ONDA_PRODUCT_MT503HS                    0x0200
 
 #define BANDRICH_VENDOR_ID                      0x1A8D
 #define BANDRICH_PRODUCT_C100_1                 0x1002
@@ -413,6 +414,40 @@ static struct usb_device_id option_ids[] = {
         { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },
         { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) },
         { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0003) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0004) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0005) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0006) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0007) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0008) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0009) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000a) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000b) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000c) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000d) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000e) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x000f) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0010) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0011) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0012) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0013) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0014) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0015) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0016) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0017) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0018) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0019) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0020) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0021) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0022) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0023) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0024) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0025) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0026) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0027) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0028) },
+        { USB_DEVICE(ONDA_VENDOR_ID, 0x0029) },
+        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MT503HS) },
         { USB_DEVICE(YISO_VENDOR_ID, YISO_PRODUCT_U893) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index d4e5fc86e43c..e61f2bfc64ad 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -167,6 +167,13 @@ UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
+/* Patch for Nokia 5310 capacity */
+UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
+                "Nokia",
+                "5310",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY ),
+
 /* Reported by Mario Rettig <mariorettig@web.de> */
 UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
                 "Nokia",
@@ -233,14 +240,14 @@ UNUSUAL_DEV(  0x0421, 0x0495, 0x0370, 0x0370,
                 US_FL_MAX_SECTORS_64 ),
 
 /* Reported by Cedric Godin <cedric@belbone.be> */
-UNUSUAL_DEV(  0x0421, 0x04b9, 0x0551, 0x0551,
+UNUSUAL_DEV(  0x0421, 0x04b9, 0x0500, 0x0551,
                 "Nokia",
                 "5300",
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
 /* Reported by Richard Nauber <RichardNauber@web.de> */
-UNUSUAL_DEV(  0x0421, 0x04fa, 0x0601, 0x0601,
+UNUSUAL_DEV(  0x0421, 0x04fa, 0x0550, 0x0660,
                 "Nokia",
                 "6300",
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
@@ -311,6 +318,18 @@ UNUSUAL_DEV(  0x045a, 0x5210, 0x0101, 0x0101,
                 US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0),
 #endif
 
+/* Reported by Tamas Kerecsen <kerecsen@bigfoot.com>
+ * Obviously the PROM has not been customized by the VAR;
+ * the Vendor and Product string descriptors are:
+ *      Generic Mass Storage (PROTOTYPE--Remember to change idVendor)
+ *      Generic Manufacturer (PROTOTYPE--Remember to change idVendor)
+ */
+UNUSUAL_DEV(  0x045e, 0xffff, 0x0000, 0x0000,
+                "Mitac",
+                "GPS",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64 ),
+
 /*
  * This virtual floppy is found in Sun equipment (x4600, x4200m2, etc.)
  * Reported by Pete Zaitcev <zaitcev@redhat.com>
@@ -370,6 +389,13 @@ UNUSUAL_DEV(  0x04b0, 0x0401, 0x0200, 0x0200,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY),
 
+/* Reported by Tobias Kunze Briseno <t-linux@fictive.com> */
+UNUSUAL_DEV(  0x04b0, 0x0403, 0x0200, 0x0200,
+                "NIKON",
+                "NIKON DSC D2H",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY),
+
 /* Reported by Milinevsky Dmitry <niam.niam@gmail.com> */
 UNUSUAL_DEV(  0x04b0, 0x0409, 0x0100, 0x0100,
                 "NIKON",