Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c

24 files changed, 194 insertions, 120 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 20104443081a..d50a99f70aee 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -158,16 +158,12 @@ static int acm_wb_is_avail(struct acm *acm)
 }
 
 /*
- * Finish write.
+ * Finish write. Caller must hold acm->write_lock
  */
 static void acm_write_done(struct acm *acm, struct acm_wb *wb)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&acm->write_lock, flags);
         wb->use = 0;
         acm->transmitting--;
-        spin_unlock_irqrestore(&acm->write_lock, flags);
 }
 
 /*
@@ -482,6 +478,7 @@ static void acm_write_bulk(struct urb *urb)
 {
         struct acm_wb *wb = urb->context;
         struct acm *acm = wb->instance;
+        unsigned long flags;
 
         if (verbose || urb->status
                         || (urb->actual_length != urb->transfer_buffer_length))
@@ -490,7 +487,9 @@ static void acm_write_bulk(struct urb *urb)
                         urb->transfer_buffer_length,
                         urb->status);
 
+        spin_lock_irqsave(&acm->write_lock, flags);
         acm_write_done(acm, wb);
+        spin_unlock_irqrestore(&acm->write_lock, flags);
         if (ACM_READY(acm))
                 schedule_work(&acm->work);
         else
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 887738577b28..6d1048faf08e 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1091,6 +1091,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
                                 continue;
                         dev_dbg(&dev->dev, "unregistering interface %s\n",
                                 dev_name(&interface->dev));
+                        interface->unregistering = 1;
                         usb_remove_sysfs_intf_files(interface);
                         device_del(&interface->dev);
                 }
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index f66fba11fbd5..4fb65fdc9dc3 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -840,7 +840,7 @@ int usb_create_sysfs_intf_files(struct usb_interface *intf)
         struct usb_host_interface *alt = intf->cur_altsetting;
         int retval;
 
-        if (intf->sysfs_files_created)
+        if (intf->sysfs_files_created || intf->unregistering)
                 return 0;
 
         /* The interface string may be present in some altsettings
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 4342bd9c3bb6..1f68af9db3f7 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -85,8 +85,8 @@ EXPORT_SYMBOL_GPL(usb_alloc_urb);
  * Must be called when a user of a urb is finished with it.  When the last user
  * of the urb calls this function, the memory of the urb is freed.
  *
- * Note: The transfer buffer associated with the urb is not freed, that must be
- * done elsewhere.
+ * Note: The transfer buffer associated with the urb is not freed unless the
+ * URB_FREE_BUFFER transfer flag is set.
  */
 void usb_free_urb(struct urb *urb)
 {
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c
index 5ee1590b8e9c..c1d34df0b157 100644
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/f_acm.c
@@ -463,7 +463,11 @@ static int acm_cdc_notify(struct f_acm *acm, u8 type, u16 value,
         notify->wLength = cpu_to_le16(length);
         memcpy(buf, data, length);
 
+        /* ep_queue() can complete immediately if it fills the fifo... */
+        spin_unlock(&acm->lock);
         status = usb_ep_queue(ep, req, GFP_ATOMIC);
+        spin_lock(&acm->lock);
+
         if (status < 0) {
                 ERROR(acm->port.func.config->cdev,
                                 "acm ttyGS%d can't notify serial state, %d\n",
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 56f592dc0b36..f3a75a929e0a 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -110,29 +110,18 @@ config USB_ISP116X_HCD
 
 config USB_ISP1760_HCD
         tristate "ISP 1760 HCD support"
-        depends on USB && EXPERIMENTAL
+        depends on USB && EXPERIMENTAL && (PCI || PPC_OF)
         ---help---
           The ISP1760 chip is a USB 2.0 host controller.
 
           This driver does not support isochronous transfers or OTG.
+          This USB controller is usually attached to a non-DMA-Master
+          capable bus. NXP's eval kit brings this chip on PCI card
+          where the chip itself is behind a PLB to simulate such
+          a bus.
 
           To compile this driver as a module, choose M here: the
-          module will be called isp1760-hcd.
-
-config USB_ISP1760_PCI
-        bool "Support for the PCI bus"
-        depends on USB_ISP1760_HCD && PCI
-        ---help---
-          Enables support for the device present on the PCI bus.
-          This should only be required if you happen to have the eval kit from
-          NXP and you are going to test it.
-
-config USB_ISP1760_OF
-        bool "Support for the OF platform bus"
-        depends on USB_ISP1760_HCD && PPC_OF
-        ---help---
-          Enables support for the device present on the PowerPC
-          OpenFirmware platform bus.
+          module will be called isp1760.
 
 config USB_OHCI_HCD
         tristate "OHCI HCD support"
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 15a803b206b8..4725d15d096f 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -643,7 +643,7 @@ static int ehci_run (struct usb_hcd *hcd)
 static irqreturn_t ehci_irq (struct usb_hcd *hcd)
 {
         struct ehci_hcd         *ehci = hcd_to_ehci (hcd);
-        u32                     status, pcd_status = 0, cmd;
+        u32                     status, masked_status, pcd_status = 0, cmd;
         int                     bh;
 
         spin_lock (&ehci->lock);
@@ -656,14 +656,14 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
                 goto dead;
         }
 
-        status &= INTR_MASK;
-        if (!status) {                  /* irq sharing? */
+        masked_status = status & INTR_MASK;
+        if (!masked_status) {           /* irq sharing? */
                 spin_unlock(&ehci->lock);
                 return IRQ_NONE;
         }
 
         /* clear (just) interrupts */
-        ehci_writel(ehci, status, &ehci->regs->status);
+        ehci_writel(ehci, masked_status, &ehci->regs->status);
         cmd = ehci_readl(ehci, &ehci->regs->command);
         bh = 0;
 
@@ -734,18 +734,17 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
 
         /* PCI errors [4.15.2.4] */
         if (unlikely ((status & STS_FATAL) != 0)) {
+                ehci_err(ehci, "fatal error\n");
                 dbg_cmd(ehci, "fatal", cmd);
                 dbg_status(ehci, "fatal", status);
-                if (status & STS_HALT) {
-                        ehci_err (ehci, "fatal error\n");
+                ehci_halt(ehci);
 dead:
-                        ehci_reset (ehci);
-                        ehci_writel(ehci, 0, &ehci->regs->configured_flag);
-                        /* generic layer kills/unlinks all urbs, then
-                         * uses ehci_stop to clean up the rest
-                         */
-                        bh = 1;
-                }
+                ehci_reset(ehci);
+                ehci_writel(ehci, 0, &ehci->regs->configured_flag);
+                /* generic layer kills/unlinks all urbs, then
+                 * uses ehci_stop to clean up the rest
+                 */
+                bh = 1;
         }
 
         if (bh)
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 0eba894bcb01..9c9da35abc6c 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -205,6 +205,7 @@ static int ps3_ehci_remove(struct ps3_system_bus_device *dev)
 
         tmp = hcd->irq;
 
+        ehci_shutdown(hcd);
         usb_remove_hcd(hcd);
 
         ps3_system_bus_set_driver_data(dev, NULL);
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 4a0c5a78b2ed..a081ee65bde6 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -918,7 +918,7 @@ iso_stream_init (
                  */
                 stream->usecs = HS_USECS_ISO (maxp);
                 bandwidth = stream->usecs * 8;
-                bandwidth /= 1 << (interval - 1);
+                bandwidth /= interval;
 
         } else {
                 u32             addr;
@@ -951,7 +951,7 @@ iso_stream_init (
                 } else
                         stream->raw_mask = smask_out [hs_transfers - 1];
                 bandwidth = stream->usecs + stream->c_usecs;
-                bandwidth /= 1 << (interval + 2);
+                bandwidth /= interval << 3;
 
                 /* stream->splits gets created from raw_mask later */
                 stream->address = cpu_to_hc32(ehci, addr);
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index af849f596135..b87ca7cf4b37 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -14,16 +14,16 @@
 #include "../core/hcd.h"
 #include "isp1760-hcd.h"
 
-#ifdef CONFIG_USB_ISP1760_OF
+#ifdef CONFIG_PPC_OF
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #endif
 
-#ifdef CONFIG_USB_ISP1760_PCI
+#ifdef CONFIG_PCI
 #include <linux/pci.h>
 #endif
 
-#ifdef CONFIG_USB_ISP1760_OF
+#ifdef CONFIG_PPC_OF
 static int of_isp1760_probe(struct of_device *dev,
                 const struct of_device_id *match)
 {
@@ -128,7 +128,7 @@ static struct of_platform_driver isp1760_of_driver = {
 };
 #endif
 
-#ifdef CONFIG_USB_ISP1760_PCI
+#ifdef CONFIG_PCI
 static u32 nxp_pci_io_base;
 static u32 iolength;
 static u32 pci_mem_phy0;
@@ -288,28 +288,28 @@ static struct pci_driver isp1761_pci_driver = {
 
 static int __init isp1760_init(void)
 {
-        int ret = -ENODEV;
+        int ret;
 
         init_kmem_once();
 
-#ifdef CONFIG_USB_ISP1760_OF
+#ifdef CONFIG_PPC_OF
         ret = of_register_platform_driver(&isp1760_of_driver);
         if (ret) {
                 deinit_kmem_cache();
                 return ret;
         }
 #endif
-#ifdef CONFIG_USB_ISP1760_PCI
+#ifdef CONFIG_PCI
         ret = pci_register_driver(&isp1761_pci_driver);
         if (ret)
                 goto unreg_of;
 #endif
         return ret;
 
-#ifdef CONFIG_USB_ISP1760_PCI
+#ifdef CONFIG_PCI
 unreg_of:
 #endif
-#ifdef CONFIG_USB_ISP1760_OF
+#ifdef CONFIG_PPC_OF
         of_unregister_platform_driver(&isp1760_of_driver);
 #endif
         deinit_kmem_cache();
@@ -319,10 +319,10 @@ module_init(isp1760_init);
 
 static void __exit isp1760_exit(void)
 {
-#ifdef CONFIG_USB_ISP1760_OF
+#ifdef CONFIG_PPC_OF
         of_unregister_platform_driver(&isp1760_of_driver);
 #endif
-#ifdef CONFIG_USB_ISP1760_PCI
+#ifdef CONFIG_PCI
         pci_unregister_driver(&isp1761_pci_driver);
 #endif
         deinit_kmem_cache();
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 2089d8a46c4b..3c1a3b5f89f1 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -192,7 +192,7 @@ fail_start:
         return result;
 }
 
-static int ps3_ohci_remove (struct ps3_system_bus_device *dev)
+static int ps3_ohci_remove(struct ps3_system_bus_device *dev)
 {
         unsigned int tmp;
         struct usb_hcd *hcd =
@@ -205,6 +205,7 @@ static int ps3_ohci_remove (struct ps3_system_bus_device *dev)
 
         tmp = hcd->irq;
 
+        ohci_shutdown(hcd);
         usb_remove_hcd(hcd);
 
         ps3_system_bus_set_driver_data(dev, NULL);
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index c18d8790c410..2376f24f3c83 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -1763,11 +1763,12 @@ static void r8a66597_timer(unsigned long _r8a66597)
 {
         struct r8a66597 *r8a66597 = (struct r8a66597 *)_r8a66597;
         unsigned long flags;
+        int port;
 
         spin_lock_irqsave(&r8a66597->lock, flags);
 
-        r8a66597_root_hub_control(r8a66597, 0);
-        r8a66597_root_hub_control(r8a66597, 1);
+        for (port = 0; port < R8A66597_MAX_ROOT_HUB; port++)
+                r8a66597_root_hub_control(r8a66597, port);
 
         spin_unlock_irqrestore(&r8a66597->lock, flags);
 }
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 69c34a58e205..b4ec716de7da 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3270,6 +3270,7 @@ static struct usb_device_id sisusb_table [] = {
         { USB_DEVICE(0x0711, 0x0900) },
         { USB_DEVICE(0x0711, 0x0901) },
         { USB_DEVICE(0x0711, 0x0902) },
+        { USB_DEVICE(0x0711, 0x0903) },
         { USB_DEVICE(0x0711, 0x0918) },
         { USB_DEVICE(0x182d, 0x021c) },
         { USB_DEVICE(0x182d, 0x0269) },
diff --git a/drivers/usb/misc/vstusb.c b/drivers/usb/misc/vstusb.c
index 8648470c81ca..63dff9ba73c5 100644
--- a/drivers/usb/misc/vstusb.c
+++ b/drivers/usb/misc/vstusb.c
@@ -620,7 +620,7 @@ static long vstusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 __func__);
                         retval = -EFAULT;
                 } else {
-                        dev_dbg(&dev->dev, "%s: recv %d bytes from pipe %d\n",
+                        dev_dbg(&dev->dev, "%s: recv %zd bytes from pipe %d\n",
                                 __func__, usb_data.count, usb_data.pipe);
                 }
 
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 4a35745b30be..5280dba9b1fb 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -114,8 +114,8 @@
 
 
 
-unsigned debug;
-module_param(debug, uint, S_IRUGO | S_IWUSR);
+unsigned musb_debug;
+module_param(musb_debug, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug message level. Default = 0");
 
 #define DRIVER_AUTHOR "Mentor Graphics, Texas Instruments, Nokia"
@@ -2248,7 +2248,7 @@ static int __init musb_init(void)
                 "host"
 #endif
                 ", debug=%d\n",
-                musb_driver_name, debug);
+                musb_driver_name, musb_debug);
         return platform_driver_probe(&musb_driver, musb_probe);
 }
 
diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index 4d2794441b15..9fc1db44c72c 100644
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -48,11 +48,11 @@
                                 __func__, __LINE__ , ## args); \
         } } while (0)
 
-extern unsigned debug;
+extern unsigned musb_debug;
 
 static inline int _dbg_level(unsigned l)
 {
-        return debug >= l;
+        return musb_debug >= l;
 }
 
 #define DBG(level, fmt, args...) xprintk(level, KERN_DEBUG, fmt, ## args)
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 3133990f04ec..e45e70bcc5e2 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -378,6 +378,19 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status)
 
                 switch (qh->type) {
 
+                case USB_ENDPOINT_XFER_CONTROL:
+                case USB_ENDPOINT_XFER_BULK:
+                        /* fifo policy for these lists, except that NAKing
+                         * should rotate a qh to the end (for fairness).
+                         */
+                        if (qh->mux == 1) {
+                                head = qh->ring.prev;
+                                list_del(&qh->ring);
+                                kfree(qh);
+                                qh = first_qh(head);
+                                break;
+                        }
+
                 case USB_ENDPOINT_XFER_ISOC:
                 case USB_ENDPOINT_XFER_INT:
                         /* this is where periodic bandwidth should be
@@ -388,17 +401,6 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status)
                         kfree(qh);
                         qh = NULL;
                         break;
-
-                case USB_ENDPOINT_XFER_CONTROL:
-                case USB_ENDPOINT_XFER_BULK:
-                        /* fifo policy for these lists, except that NAKing
-                         * should rotate a qh to the end (for fairness).
-                         */
-                        head = qh->ring.prev;
-                        list_del(&qh->ring);
-                        kfree(qh);
-                        qh = first_qh(head);
-                        break;
                 }
         }
         return qh;
@@ -1507,10 +1509,29 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                 musb_writew(hw_ep->regs, MUSB_RXCSR, val);
 
 #ifdef CONFIG_USB_INVENTRA_DMA
+                if (usb_pipeisoc(pipe)) {
+                        struct usb_iso_packet_descriptor *d;
+
+                        d = urb->iso_frame_desc + qh->iso_idx;
+                        d->actual_length = xfer_len;
+
+                        /* even if there was an error, we did the dma
+                         * for iso_frame_desc->length
+                         */
+                        if (d->status != EILSEQ && d->status != -EOVERFLOW)
+                                d->status = 0;
+
+                        if (++qh->iso_idx >= urb->number_of_packets)
+                                done = true;
+                        else
+                                done = false;
+
+                } else  {
                 /* done if urb buffer is full or short packet is recd */
                 done = (urb->actual_length + xfer_len >=
                                 urb->transfer_buffer_length
                         || dma->actual_len < qh->maxpacket);
+                }
 
                 /* send IN token for next packet, without AUTOREQ */
                 if (!done) {
@@ -1547,7 +1568,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                 if (dma) {
                         struct dma_controller   *c;
                         u16                     rx_count;
-                        int                     ret;
+                        int                     ret, length;
+                        dma_addr_t              buf;
 
                         rx_count = musb_readw(epio, MUSB_RXCOUNT);
 
@@ -1560,6 +1582,35 @@ void musb_host_rx(struct musb *musb, u8 epnum)
 
                         c = musb->dma_controller;
 
+                        if (usb_pipeisoc(pipe)) {
+                                int status = 0;
+                                struct usb_iso_packet_descriptor *d;
+
+                                d = urb->iso_frame_desc + qh->iso_idx;
+
+                                if (iso_err) {
+                                        status = -EILSEQ;
+                                        urb->error_count++;
+                                }
+                                if (rx_count > d->length) {
+                                        if (status == 0) {
+                                                status = -EOVERFLOW;
+                                                urb->error_count++;
+                                        }
+                                        DBG(2, "** OVERFLOW %d into %d\n",\
+                                            rx_count, d->length);
+
+                                        length = d->length;
+                                } else
+                                        length = rx_count;
+                                d->status = status;
+                                buf = urb->transfer_dma + d->offset;
+                        } else {
+                                length = rx_count;
+                                buf = urb->transfer_dma +
+                                                urb->actual_length;
+                        }
+
                         dma->desired_mode = 0;
 #ifdef USE_MODE1
                         /* because of the issue below, mode 1 will
@@ -1571,6 +1622,12 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                                                 urb->actual_length)
                                         > qh->maxpacket)
                                 dma->desired_mode = 1;
+                        if (rx_count < hw_ep->max_packet_sz_rx) {
+                                length = rx_count;
+                                dma->bDesiredMode = 0;
+                        } else {
+                                length = urb->transfer_buffer_length;
+                        }
 #endif
 
 /* Disadvantage of using mode 1:
@@ -1608,12 +1665,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                          */
                         ret = c->channel_program(
                                 dma, qh->maxpacket,
-                                dma->desired_mode,
-                                urb->transfer_dma
-                                        + urb->actual_length,
-                                (dma->desired_mode == 0)
-                                        ? rx_count
-                                        : urb->transfer_buffer_length);
+                                dma->desired_mode, buf, length);
 
                         if (!ret) {
                                 c->channel_release(dma);
@@ -1631,19 +1683,6 @@ void musb_host_rx(struct musb *musb, u8 epnum)
                 }
         }
 
-        if (dma && usb_pipeisoc(pipe)) {
-                struct usb_iso_packet_descriptor        *d;
-                int                                     iso_stat = status;
-
-                d = urb->iso_frame_desc + qh->iso_idx;
-                d->actual_length += xfer_len;
-                if (iso_err) {
-                        iso_stat = -EILSEQ;
-                        urb->error_count++;
-                }
-                d->status = iso_stat;
-        }
-
 finish:
         urb->actual_length += xfer_len;
         qh->offset += xfer_len;
@@ -1671,22 +1710,9 @@ static int musb_schedule(
         struct list_head        *head = NULL;
 
         /* use fixed hardware for control and bulk */
-        switch (qh->type) {
-        case USB_ENDPOINT_XFER_CONTROL:
+        if (qh->type == USB_ENDPOINT_XFER_CONTROL) {
                 head = &musb->control;
                 hw_ep = musb->control_ep;
-                break;
-        case USB_ENDPOINT_XFER_BULK:
-                hw_ep = musb->bulk_ep;
-                if (is_in)
-                        head = &musb->in_bulk;
-                else
-                        head = &musb->out_bulk;
-                break;
-        }
-        if (head) {
-                idle = list_empty(head);
-                list_add_tail(&qh->ring, head);
                 goto success;
         }
 
@@ -1725,19 +1751,34 @@ static int musb_schedule(
                 else
                         diff = hw_ep->max_packet_sz_tx - qh->maxpacket;
 
-                if (diff > 0 && best_diff > diff) {
+                if (diff >= 0 && best_diff > diff) {
                         best_diff = diff;
                         best_end = epnum;
                 }
         }
-        if (best_end < 0)
+        /* use bulk reserved ep1 if no other ep is free */
+        if (best_end > 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
+                hw_ep = musb->bulk_ep;
+                if (is_in)
+                        head = &musb->in_bulk;
+                else
+                        head = &musb->out_bulk;
+                goto success;
+        } else if (best_end < 0) {
                 return -ENOSPC;
+        }
 
         idle = 1;
+        qh->mux = 0;
         hw_ep = musb->endpoints + best_end;
         musb->periodic[best_end] = qh;
         DBG(4, "qh %p periodic slot %d\n", qh, best_end);
 success:
+        if (head) {
+                idle = list_empty(head);
+                list_add_tail(&qh->ring, head);
+                qh->mux = 1;
+        }
         qh->hw_ep = hw_ep;
         qh->hep->hcpriv = qh;
         if (idle)
@@ -2015,11 +2056,13 @@ static int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                         sched = &musb->control;
                         break;
                 case USB_ENDPOINT_XFER_BULK:
-                        if (usb_pipein(urb->pipe))
-                                sched = &musb->in_bulk;
-                        else
-                                sched = &musb->out_bulk;
-                        break;
+                        if (qh->mux == 1) {
+                                if (usb_pipein(urb->pipe))
+                                        sched = &musb->in_bulk;
+                                else
+                                        sched = &musb->out_bulk;
+                                break;
+                        }
                 default:
                         /* REVISIT when we get a schedule tree, periodic
                          * transfers won't always be at the head of a
@@ -2067,11 +2110,13 @@ musb_h_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep)
                 sched = &musb->control;
                 break;
         case USB_ENDPOINT_XFER_BULK:
-                if (is_in)
-                        sched = &musb->in_bulk;
-                else
-                        sched = &musb->out_bulk;
-                break;
+                if (qh->mux == 1) {
+                        if (is_in)
+                                sched = &musb->in_bulk;
+                        else
+                                sched = &musb->out_bulk;
+                        break;
+                }
         default:
                 /* REVISIT when we get a schedule tree, periodic transfers
                  * won't always be at the head of a singleton queue...
diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h
index 77bcdb9d5b32..0b7fbcd21963 100644
--- a/drivers/usb/musb/musb_host.h
+++ b/drivers/usb/musb/musb_host.h
@@ -53,6 +53,7 @@ struct musb_qh {
 
         struct list_head        ring;           /* of musb_qh */
         /* struct musb_qh               *next; */       /* for periodic tree */
+        u8                      mux;            /* qh multiplexed to hw_ep */
 
         unsigned                offset;         /* in urb->transfer_buffer */
         unsigned                segsize;        /* current xfer fragment */
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 9d2dcb121c5e..ce6c162920f7 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -53,7 +53,9 @@ static void musb_do_idle(unsigned long _musb)
 {
         struct musb     *musb = (void *)_musb;
         unsigned long   flags;
+#ifdef CONFIG_USB_MUSB_HDRC_HCD
         u8      power;
+#endif
         u8      devctl;
 
         devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index b73b036f3d77..ee8fca92a4ac 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -605,7 +605,7 @@ void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
 
         if (musb->board_mode != MUSB_OTG) {
                 ERR("Changing mode currently only supported in OTG mode\n");
-                return;
+                return -EINVAL;
         }
 
         otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT);
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 8008d0bc80ad..9035d7256b03 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -67,6 +67,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10C4, 0x800A) }, /* SPORTident BSM7-D-USB main station */
         { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */
         { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */
+        { USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */
         { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */
         { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */
         { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
@@ -85,6 +86,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
         { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */
         { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
+        { USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index bd07eaa300b9..6fa1ec441b61 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -160,6 +160,11 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 
 #define NOVATELWIRELESS_VENDOR_ID               0x1410
 
+/* YISO PRODUCTS */
+
+#define YISO_VENDOR_ID                          0x0EAB
+#define YISO_PRODUCT_U893                       0xC893
+
 /* MERLIN EVDO PRODUCTS */
 #define NOVATELWIRELESS_PRODUCT_V640            0x1100
 #define NOVATELWIRELESS_PRODUCT_V620            0x1110
@@ -408,6 +413,7 @@ 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(YISO_VENDOR_ID, YISO_PRODUCT_U893) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
         { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1004) },
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 3d9249632ae1..c68b738900bd 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -2,8 +2,8 @@
 # USB Storage driver configuration
 #
 
-comment "NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'"
-comment "may also be needed; see USB_STORAGE Help for more information"
+comment "NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;"
+comment "see USB_STORAGE Help for more information"
         depends on USB
 
 config USB_STORAGE
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index fb9e20e624c1..d4e5fc86e43c 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -253,6 +253,14 @@ UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
         US_SC_DEVICE, US_PR_DEVICE, NULL,
         US_FL_FIX_CAPACITY ),
 
+/* Submitted by Ricky Wong Yung Fei <evilbladewarrior@gmail.com> */
+/* Nokia 7610 Supernova - Too many sectors reported in usb storage mode */
+UNUSUAL_DEV(  0x0421, 0x00f5, 0x0000, 0x0470,
+        "Nokia",
+        "7610 Supernova",
+        US_SC_DEVICE, US_PR_DEVICE, NULL,
+        US_FL_FIX_CAPACITY ),
+
 /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
                 "SMSC",
@@ -418,6 +426,13 @@ UNUSUAL_DEV(  0x04b0, 0x0417, 0x0100, 0x0100,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY),
 
+/* Reported by paul ready <lxtwin@homecall.co.uk> */
+UNUSUAL_DEV(  0x04b0, 0x0419, 0x0100, 0x0200,
+                "NIKON",
+                "NIKON DSC D300",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY),
+
 /* Reported by Doug Maxey (dwm@austin.ibm.com) */
 UNUSUAL_DEV(  0x04b3, 0x4001, 0x0110, 0x0110,
                 "IBM",
@@ -1258,6 +1273,13 @@ UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_INQUIRY),
 
+/* Reported by Luciano Rocha <luciano@eurotux.com> */
+UNUSUAL_DEV( 0x0840, 0x0082, 0x0001, 0x0001,
+                "Argosy",
+                "Storage",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY),
+
 /* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.
  * Flag will support Bulk devices which use a standards-violating 32-byte
  * Command Block Wrapper. Here, the "DC2MEGA" cameras (several brands) with