Merge branch 'master'

37 files changed, 222 insertions, 215 deletions

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 588e75ec1630..a6b4f02bdceb 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1095,17 +1095,17 @@ static inline void sx_receive_chars (struct sx_port *port)
 
                 sx_dprintk (SX_DEBUG_RECEIVE, "rxop=%d, c = %d.\n", rx_op, c); 
 
+                /* Don't copy past the end of the hardware receive buffer */
+                if (rx_op + c > 0x100) c = 0x100 - rx_op;
+
+                sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c);
+
                 /* Don't copy more bytes than there is room for in the buffer */
 
                 c = tty_prepare_flip_string(tty, &rp, c);
 
                 sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c); 
 
-                /* Don't copy past the end of the hardware receive buffer */
-                if (rx_op + c > 0x100) c = 0x100 - rx_op;
-
-                sx_dprintk (SX_DEBUG_RECEIVE, "c = %d.\n", c);
-
                 /* If for one reason or another, we can't copy more data, we're done! */
                 if (c == 0) break;
 
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index a85a60a93deb..b046390cd256 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -306,7 +306,7 @@ struct slgt_info {
         int tx_active;
 
         unsigned char signals;    /* serial signal states */
-        unsigned int init_error;  /* initialization error */
+        int init_error;  /* initialization error */
 
         unsigned char *tx_buf;
         int tx_count;
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index e9bba94fc898..53d3d066554e 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -303,7 +303,7 @@ static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size)
                         t->commit = 0;
                         t->read = 0;
                         /* DEBUG ONLY */
-                        memset(t->data, '*', size);
+/*                      memset(t->data, '*', size); */
 /*                      printk("Flip recycle %p\n", t); */
                         return t;
                 }
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index 39fb88309e8e..216dbbf1dc8e 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -744,7 +744,7 @@ static int __video1394_ioctl(struct file *file,
                         if (i == ISO_CHANNELS) {
                             PRINT(KERN_ERR, ohci->host->id, 
                                   "No free channel found");
-                            return EAGAIN;
+                            return -EAGAIN;
                         }
                         if (!(ohci->ISO_channel_usage & mask)) {
                             v.channel = i;
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 7b7ca5ab5ae4..d01b6a9198e0 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -89,8 +89,34 @@ static int parse_redboot_partitions(struct mtd_info *master,
                         i = numslots;
                         break;
                 }
-                if (!memcmp(buf[i].name, "FIS directory", 14))
+                if (!memcmp(buf[i].name, "FIS directory", 14)) {
+                        /* This is apparently the FIS directory entry for the
+                         * FIS directory itself.  The FIS directory size is
+                         * one erase block, if the buf[i].size field is
+                         * swab32(erasesize) then we know we are looking at
+                         * a byte swapped FIS directory - swap all the entries!
+                         * (NOTE: this is 'size' not 'data_length', size is
+                         * the full size of the entry.)
+                         */
+                        if (swab32(buf[i].size) == master->erasesize) {
+                                int j;
+                                for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) {
+                                        /* The unsigned long fields were written with the
+                                         * wrong byte sex, name and pad have no byte sex.
+                                         */
+#                                       define do_swab32(x) (x) = swab32(x)
+                                        do_swab32(buf[j].flash_base);
+                                        do_swab32(buf[j].mem_base);
+                                        do_swab32(buf[j].size);
+                                        do_swab32(buf[j].entry_point);
+                                        do_swab32(buf[j].data_length);
+                                        do_swab32(buf[j].desc_cksum);
+                                        do_swab32(buf[j].file_cksum);
+#                                       undef do_swab32
+                                }
+                        }
                         break;
+                }
         }
         if (i == numslots) {
                 /* Didn't find it */
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index f822cd3025ff..dd410496aadb 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1118,13 +1118,18 @@ err_out:
         return -ENOMEM;
 }
 
+static void cp_init_rings_index (struct cp_private *cp)
+{
+        cp->rx_tail = 0;
+        cp->tx_head = cp->tx_tail = 0;
+}
+
 static int cp_init_rings (struct cp_private *cp)
 {
         memset(cp->tx_ring, 0, sizeof(struct cp_desc) * CP_TX_RING_SIZE);
         cp->tx_ring[CP_TX_RING_SIZE - 1].opts1 = cpu_to_le32(RingEnd);
 
-        cp->rx_tail = 0;
-        cp->tx_head = cp->tx_tail = 0;
+        cp_init_rings_index(cp);
 
         return cp_refill_rx (cp);
 }
@@ -1886,30 +1891,30 @@ static int cp_suspend (struct pci_dev *pdev, pm_message_t state)
 
         spin_unlock_irqrestore (&cp->lock, flags);
 
-        if (cp->pdev && cp->wol_enabled) {
-                pci_save_state (cp->pdev);
-                cp_set_d3_state (cp);
-        }
+        pci_save_state(pdev);
+        pci_enable_wake(pdev, pci_choose_state(pdev, state), cp->wol_enabled);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
 
 static int cp_resume (struct pci_dev *pdev)
 {
-        struct net_device *dev;
-        struct cp_private *cp;
+        struct net_device *dev = pci_get_drvdata (pdev);
+        struct cp_private *cp = netdev_priv(dev);
         unsigned long flags;
 
-        dev = pci_get_drvdata (pdev);
-        cp  = netdev_priv(dev);
+        if (!netif_running(dev))
+                return 0;
 
         netif_device_attach (dev);
-        
-        if (cp->pdev && cp->wol_enabled) {
-                pci_set_power_state (cp->pdev, PCI_D0);
-                pci_restore_state (cp->pdev);
-        }
-        
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        pci_enable_wake(pdev, PCI_D0, 0);
+
+        /* FIXME: sh*t may happen if the Rx ring buffer is depleted */
+        cp_init_rings_index (cp);
         cp_init_hw (cp);
         netif_start_queue (dev);
 
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index ca8160d68229..72c1630977d6 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -96,10 +96,6 @@ static int copybreak __read_mostly = 256;
 module_param(copybreak, int, 0);
 MODULE_PARM_DESC(copybreak, "Receive copy threshold");
 
-static int disable_msi = 0;
-module_param(disable_msi, int, 0);
-MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
-
 static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) },
@@ -3126,61 +3122,6 @@ static void __devinit sky2_show_addr(struct net_device *dev)
                        dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
 }
 
-/* Handle software interrupt used during MSI test */
-static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id,
-                                            struct pt_regs *regs)
-{
-        struct sky2_hw *hw = dev_id;
-        u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2);
-
-        if (status == 0)
-                return IRQ_NONE;
-
-        if (status & Y2_IS_IRQ_SW) {
-                sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ);
-                hw->msi = 1;
-        }
-        sky2_write32(hw, B0_Y2_SP_ICR, 2);
-
-        sky2_read32(hw, B0_IMSK);
-        return IRQ_HANDLED;
-}
-
-/* Test interrupt path by forcing a a software IRQ */
-static int __devinit sky2_test_msi(struct sky2_hw *hw)
-{
-        struct pci_dev *pdev = hw->pdev;
-        int i, err;
-
-        sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
-
-        err = request_irq(pdev->irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw);
-        if (err) {
-                printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
-                       pci_name(pdev), pdev->irq);
-                return err;
-        }
-
-        sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ);
-        wmb();
-
-        for (i = 0; i < 10; i++) {
-                barrier();
-                if (hw->msi)
-                        goto found;
-                mdelay(1);
-        }
-
-        err = -EOPNOTSUPP;
-        sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ);
- found:
-        sky2_write32(hw, B0_IMSK, 0);
-
-        free_irq(pdev->irq, hw);
-
-        return err;
-}
-
 static int __devinit sky2_probe(struct pci_dev *pdev,
                                 const struct pci_device_id *ent)
 {
@@ -3302,20 +3243,6 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                 }
         }
 
-        if (!disable_msi && pci_enable_msi(pdev) == 0) {
-                err = sky2_test_msi(hw);
-                if (err == -EOPNOTSUPP) {
-                        /* MSI test failed, go back to INTx mode */
-                        printk(KERN_WARNING PFX "%s: No interrupt was generated using MSI, "
-                               "switching to INTx mode. Please report this failure to "
-                               "the PCI maintainer and include system chipset information.\n",
-                               pci_name(pdev));
-                        pci_disable_msi(pdev);
-                }
-                else if (err)
-                        goto err_out_unregister;
-        }
-
         err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
                           DRV_NAME, hw);
         if (err) {
@@ -3332,8 +3259,6 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
         return 0;
 
 err_out_unregister:
-        if (hw->msi)
-                pci_disable_msi(pdev);
         if (dev1) {
                 unregister_netdev(dev1);
                 free_netdev(dev1);
@@ -3376,8 +3301,6 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
         sky2_read8(hw, B0_CTST);
 
         free_irq(pdev->irq, hw);
-        if (hw->msi)
-                pci_disable_msi(pdev);
         pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 3edb98075e0a..dce955c76f3c 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1881,7 +1881,6 @@ struct sky2_hw {
         u32                  intr_mask;
 
         int                  pm_cap;
-        int                  msi;
         u8                   chip_id;
         u8                   chip_rev;
         u8                   copper;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e7dc653d5bd6..e8e92c853e89 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -9408,6 +9408,15 @@ static int __devinit tg3_is_sun_570X(struct tg3 *tp)
                         return 0;
                 if (venid == PCI_VENDOR_ID_SUN)
                         return 1;
+
+                /* TG3 chips onboard the SunBlade-2500 don't have the
+                 * subsystem-vendor-id set to PCI_VENDOR_ID_SUN but they
+                 * are distinguishable from non-Sun variants by being
+                 * named "network" by the firmware.  Non-Sun cards will
+                 * show up as being named "ethernet".
+                 */
+                if (!strcmp(pcp->prom_name, "network"))
+                        return 1;
         }
         return 0;
 }
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index c2d5907dc8e0..ed1f837c8fda 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1106,6 +1106,9 @@ static void velocity_free_rd_ring(struct velocity_info *vptr)
 
         for (i = 0; i < vptr->options.numrx; i++) {
                 struct velocity_rd_info *rd_info = &(vptr->rd_info[i]);
+                struct rx_desc *rd = vptr->rd_ring + i;
+
+                memset(rd, 0, sizeof(*rd));
 
                 if (!rd_info->skb)
                         continue;
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index aaa568a3806e..b68eef251614 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -303,13 +303,11 @@ found:
         down_write(&dev->dev.bus->subsys.rwsem);
         dev->card_link = clink;
         dev->dev.driver = &drv->link.driver;
-        if (drv->link.driver.probe) {
-                if (drv->link.driver.probe(&dev->dev)) {
-                        dev->dev.driver = NULL;
-                        dev->card_link = NULL;
-                        up_write(&dev->dev.bus->subsys.rwsem);
-                        return NULL;
-                }
+        if (pnp_bus_type.probe(&dev->dev)) {
+                dev->dev.driver = NULL;
+                dev->card_link = NULL;
+                up_write(&dev->dev.bus->subsys.rwsem);
+                return NULL;
         }
         device_bind_driver(&dev->dev);
         up_write(&dev->dev.bus->subsys.rwsem);
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index cb2ee25f213f..531a1f9ceb51 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1260,16 +1260,15 @@ static void free_hard_reset_SCs(struct Scsi_Host *shpnt, Scsi_Cmnd **SCs)
  * Reset the bus
  *
  */
-static int aha152x_bus_reset(Scsi_Cmnd *SCpnt)
+static int aha152x_bus_reset_host(struct Scsi_Host *shpnt)
 {
-        struct Scsi_Host *shpnt = SCpnt->device->host;
         unsigned long flags;
 
         DO_LOCK(flags);
 
 #if defined(AHA152X_DEBUG)
         if(HOSTDATA(shpnt)->debug & debug_eh) {
-                printk(DEBUG_LEAD "aha152x_bus_reset(%p)", CMDINFO(SCpnt), SCpnt);
+                printk(KERN_DEBUG "scsi%d: bus reset", shpnt->host_no);
                 show_queues(shpnt);
         }
 #endif
@@ -1277,14 +1276,14 @@ static int aha152x_bus_reset(Scsi_Cmnd *SCpnt)
         free_hard_reset_SCs(shpnt, &ISSUE_SC);
         free_hard_reset_SCs(shpnt, &DISCONNECTED_SC);
 
-        DPRINTK(debug_eh, DEBUG_LEAD "resetting bus\n", CMDINFO(SCpnt));
+        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: resetting bus\n", shpnt->host_no);
 
         SETPORT(SCSISEQ, SCSIRSTO);
         mdelay(256);
         SETPORT(SCSISEQ, 0);
         mdelay(DELAY);
 
-        DPRINTK(debug_eh, DEBUG_LEAD "bus resetted\n", CMDINFO(SCpnt));
+        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: bus resetted\n", shpnt->host_no);
 
         setup_expected_interrupts(shpnt);
         if(HOSTDATA(shpnt)->commands==0)
@@ -1295,6 +1294,14 @@ static int aha152x_bus_reset(Scsi_Cmnd *SCpnt)
         return SUCCESS;
 }
 
+/*
+ * Reset the bus
+ *
+ */
+static int aha152x_bus_reset(Scsi_Cmnd *SCpnt)
+{
+        return aha152x_bus_reset_host(SCpnt->device->host);
+}
 
 /*
  *  Restore default values to the AIC-6260 registers and reset the fifos
@@ -1337,23 +1344,28 @@ static void reset_ports(struct Scsi_Host *shpnt)
  * Reset the host (bus and controller)
  *
  */
-int aha152x_host_reset(Scsi_Cmnd * SCpnt)
+int aha152x_host_reset_host(struct Scsi_Host *shpnt)
 {
-#if defined(AHA152X_DEBUG)
-        struct Scsi_Host *shpnt = SCpnt->device->host;
-#endif
-
-        DPRINTK(debug_eh, DEBUG_LEAD "aha152x_host_reset(%p)\n", CMDINFO(SCpnt), SCpnt);
+        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: host reset\n", shpnt->host_no);
 
-        aha152x_bus_reset(SCpnt);
+        aha152x_bus_reset_host(shpnt);
 
-        DPRINTK(debug_eh, DEBUG_LEAD "resetting ports\n", CMDINFO(SCpnt));
-        reset_ports(SCpnt->device->host);
+        DPRINTK(debug_eh, KERN_DEBUG "scsi%d: resetting ports\n", shpnt->host_no);
+        reset_ports(shpnt);
 
         return SUCCESS;
 }
 
 /*
+ * Reset the host (bus and controller)
+ * 
+ */
+static int aha152x_host_reset(Scsi_Cmnd *SCpnt)
+{
+        return aha152x_host_reset_host(SCpnt->device->host);
+}
+
+/*
  * Return the "logical geometry"
  *
  */
@@ -1431,22 +1443,18 @@ static void run(void)
 {
         int i;
         for (i = 0; i<ARRAY_SIZE(aha152x_host); i++) {
-                struct Scsi_Host *shpnt = aha152x_host[i];
-                if (shpnt && HOSTDATA(shpnt)->service) {
-                        HOSTDATA(shpnt)->service=0;
-                        is_complete(shpnt);
-                }
+                is_complete(aha152x_host[i]);
         }
 }
 
 /*
- *    Interrupts handler
+ * Interrupt handler
  *
  */
-
 static irqreturn_t intr(int irqno, void *dev_id, struct pt_regs *regs)
 {
         struct Scsi_Host *shpnt = lookup_irq(irqno);
+        unsigned long flags;
         unsigned char rev, dmacntrl0;
 
         if (!shpnt) {
@@ -1472,23 +1480,23 @@ static irqreturn_t intr(int irqno, void *dev_id, struct pt_regs *regs)
         if ((rev == 0xFF) && (dmacntrl0 == 0xFF))
                 return IRQ_NONE;
 
+        if( TESTLO(DMASTAT, INTSTAT) )
+                return IRQ_NONE;        
+
         /* no more interrupts from the controller, while we're busy.
            INTEN is restored by the BH handler */
         CLRBITS(DMACNTRL0, INTEN);
 
-#if 0
-        /* check if there is already something to be
-           serviced; should not happen */
-        if(HOSTDATA(shpnt)->service) {
-                printk(KERN_ERR "aha152x%d: lost interrupt (%d)\n", HOSTNO, HOSTDATA(shpnt)->service);
-                show_queues(shpnt);
+        DO_LOCK(flags);
+        if( HOSTDATA(shpnt)->service==0 ) {
+                HOSTDATA(shpnt)->service=1;
+
+                /* Poke the BH handler */
+                INIT_WORK(&aha152x_tq, (void *) run, NULL);
+                schedule_work(&aha152x_tq);
         }
-#endif
-        
-        /* Poke the BH handler */
-        HOSTDATA(shpnt)->service++;
-        INIT_WORK(&aha152x_tq, (void *) run, NULL);
-        schedule_work(&aha152x_tq);
+        DO_UNLOCK(flags);
+
         return IRQ_HANDLED;
 }
 
@@ -2527,7 +2535,18 @@ static void is_complete(struct Scsi_Host *shpnt)
         unsigned long flags;
         int pending;
 
+        if(!shpnt)
+                return;
+
         DO_LOCK(flags);
+
+        if( HOSTDATA(shpnt)->service==0 )  {
+                DO_UNLOCK(flags);
+                return;
+        }
+
+        HOSTDATA(shpnt)->service = 0;
+
         if(HOSTDATA(shpnt)->in_intr) {
                 DO_UNLOCK(flags);
                 /* aha152x_error never returns.. */
diff --git a/drivers/scsi/aha152x.h b/drivers/scsi/aha152x.h
index d277613af29b..d2add24d02a3 100644
--- a/drivers/scsi/aha152x.h
+++ b/drivers/scsi/aha152x.h
@@ -332,6 +332,6 @@ struct aha152x_setup {
 
 struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *);
 void aha152x_release(struct Scsi_Host *);
-int aha152x_host_reset(Scsi_Cmnd *);
+int aha152x_host_reset_host(struct Scsi_Host *);
 
 #endif /* _AHA152X_H */
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index 23728d1c980c..fcd304e11c26 100644
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -65,27 +65,6 @@ static int jazz_esp_release(struct Scsi_Host *shost)
         return 0;
 }
 
-static struct scsi_host_template driver_template = {
-        .proc_name              = "jazz_esp",
-        .proc_info              = &esp_proc_info,
-        .name                   = "ESP 100/100a/200",
-        .detect                 = jazz_esp_detect,
-        .slave_alloc            = esp_slave_alloc,
-        .slave_destroy          = esp_slave_destroy,
-        .release                = jazz_esp_release,
-        .info                   = esp_info,
-        .queuecommand           = esp_queue,
-        .eh_abort_handler       = esp_abort,
-        .eh_bus_reset_handler   = esp_reset,
-        .can_queue              = 7,
-        .this_id                = 7,
-        .sg_tablesize           = SG_ALL,
-        .cmd_per_lun            = 1,
-        .use_clustering         = DISABLE_CLUSTERING,
-};
-
-#include "scsi_module.c"
-
 /***************************************************************** Detection */
 static int jazz_esp_detect(struct scsi_host_template *tpnt)
 {
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index ab3257a6b860..17c1df435cc8 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -78,6 +78,10 @@ int atapi_enabled = 0;
 module_param(atapi_enabled, int, 0444);
 MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
 
+int libata_fua = 0;
+module_param_named(fua, libata_fua, int, 0444);
+MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");
+
 MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("Library module for ATA devices");
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 538784e65cdc..d0bd94abb413 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -1803,6 +1803,8 @@ static int ata_dev_supports_fua(u16 *id)
 {
         unsigned char model[41], fw[9];
 
+        if (!libata_fua)
+                return 0;
         if (!ata_id_has_fua(id))
                 return 0;
 
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 9d76923a2253..d822eba05f3c 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -41,6 +41,7 @@ struct ata_scsi_args {
 
 /* libata-core.c */
 extern int atapi_enabled;
+extern int libata_fua;
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
                                       struct ata_device *dev);
 extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 7de267e14458..4f39dd01936d 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -793,6 +793,20 @@ megasas_queue_command(struct scsi_cmnd *scmd, void (*done) (struct scsi_cmnd *))
         return 0;
 }
 
+static int megasas_slave_configure(struct scsi_device *sdev)
+{
+        /*
+         * Don't export physical disk devices to the disk driver.
+         *
+         * FIXME: Currently we don't export them to the midlayer at all.
+         *        That will be fixed once LSI engineers have audited the
+         *        firmware for possible issues.
+         */
+        if (sdev->channel < MEGASAS_MAX_PD_CHANNELS && sdev->type == TYPE_DISK)
+                return -ENXIO;
+        return 0;
+}
+
 /**
  * megasas_wait_for_outstanding -       Wait for all outstanding cmds
  * @instance:                           Adapter soft state
@@ -943,6 +957,7 @@ static struct scsi_host_template megasas_template = {
         .module = THIS_MODULE,
         .name = "LSI Logic SAS based MegaRAID driver",
         .proc_name = "megaraid_sas",
+        .slave_configure = megasas_slave_configure,
         .queuecommand = megasas_queue_command,
         .eh_device_reset_handler = megasas_reset_device,
         .eh_bus_reset_handler = megasas_reset_bus_host,
@@ -1071,20 +1086,6 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
                         break;
                 }
 
-                /*
-                 * Don't export physical disk devices to mid-layer.
-                 */
-                if (!MEGASAS_IS_LOGICAL(cmd->scmd) &&
-                    (hdr->cmd_status == MFI_STAT_OK) &&
-                    (cmd->scmd->cmnd[0] == INQUIRY)) {
-
-                        if (((*(u8 *) cmd->scmd->request_buffer) & 0x1F) ==
-                            TYPE_DISK) {
-                                cmd->scmd->result = DID_BAD_TARGET << 16;
-                                exception = 1;
-                        }
-                }
-
         case MFI_CMD_LD_READ:
         case MFI_CMD_LD_WRITE:
 
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 0c9edb7051f4..5609847e254a 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -275,10 +275,8 @@ static int aha152x_resume(struct pcmcia_device *dev)
 
         link->state &= ~DEV_SUSPEND;
         if (link->state & DEV_CONFIG) {
-                Scsi_Cmnd tmp;
                 pcmcia_request_configuration(link->handle, &link->conf);
-                tmp.device->host = info->host;
-                aha152x_host_reset(&tmp);
+                aha152x_host_reset_host(info->host);
         }
 
         return 0;
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 50f8057be75d..5d169a2881b9 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1308,7 +1308,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
          * the request was not marked fast fail.  Note that above,
          * even if the request is marked fast fail, we still requeue
          * for queue congestion conditions (QUEUE_FULL or BUSY) */
-        if ((++scmd->retries) < scmd->allowed 
+        if ((++scmd->retries) <= scmd->allowed
             && !blk_noretry_request(scmd->request)) {
                 return NEEDS_RETRY;
         } else {
@@ -1433,7 +1433,7 @@ void scsi_eh_flush_done_q(struct list_head *done_q)
                 list_del_init(&scmd->eh_entry);
                 if (scsi_device_online(scmd->device) &&
                     !blk_noretry_request(scmd->request) &&
-                    (++scmd->retries < scmd->allowed)) {
+                    (++scmd->retries <= scmd->allowed)) {
                         SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush"
                                                           " retry cmd: %p\n",
                                                           current->comm,
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 4362dcde74af..701a328f7beb 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1498,7 +1498,7 @@ static void scsi_kill_request(struct request *req, request_queue_t *q)
 static void scsi_softirq_done(struct request *rq)
 {
         struct scsi_cmnd *cmd = rq->completion_data;
-        unsigned long wait_for = cmd->allowed * cmd->timeout_per_command;
+        unsigned long wait_for = (cmd->allowed + 1) * cmd->timeout_per_command;
         int disposition;
 
         INIT_LIST_HEAD(&cmd->eh_entry);
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 5acb83ca5ae5..f9ecc3dea7df 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -752,8 +752,20 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
 
         transport_configure_device(&sdev->sdev_gendev);
 
-        if (sdev->host->hostt->slave_configure)
-                sdev->host->hostt->slave_configure(sdev);
+        if (sdev->host->hostt->slave_configure) {
+                int ret = sdev->host->hostt->slave_configure(sdev);
+                if (ret) {
+                        /*
+                         * if LLDD reports slave not present, don't clutter
+                         * console with alloc failure messages
+                         */
+                        if (ret != -ENXIO) {
+                                sdev_printk(KERN_ERR, sdev,
+                                        "failed to configure device\n");
+                        }
+                        return SCSI_SCAN_NO_RESPONSE;
+                }
+        }
 
         /*
          * Ok, the device is now all set up, we can
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index f2c9acf11bd0..929032e370db 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -1498,8 +1498,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
         }
 
         /* Search the bindings array */
-        if (likely((ids->roles & FC_RPORT_ROLE_FCP_TARGET) &&
-                (fc_host_tgtid_bind_type(shost) != FC_TGTID_BIND_NONE))) {
+        if (fc_host_tgtid_bind_type(shost) != FC_TGTID_BIND_NONE) {
 
                 /* search for a matching consistent binding */
 
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 2a547538d444..5a0a19322d01 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2162,7 +2162,7 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size)
 
         srp->res_used = 1;
         SCSI_LOG_TIMEOUT(4, printk("sg_link_reserve: size=%d\n", size));
-        rem = size = (size + 1) & (~1); /* round to even for aha1542 */
+        rem = size;
 
         for (k = 0; k < rsv_schp->k_use_sg; ++k, ++sg) {
                 num = sg->length;
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index f4854c33f48d..2627000ca653 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -919,6 +919,8 @@ static int sym_prepare_setting(struct Scsi_Host *shost, struct sym_hcb *np, stru
 
                 tp->usrflags |= (SYM_DISC_ENABLED | SYM_TAGS_ENABLED);
                 tp->usrtags = SYM_SETUP_MAX_TAG;
+                tp->usr_width = np->maxwide;
+                tp->usr_period = 9;
 
                 sym_nvram_setup_target(tp, i, nvram);
 
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 308704566948..4e453fa966ae 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -299,13 +299,10 @@ static void sunsu_start_tx(struct uart_port *port)
 static void sunsu_stop_rx(struct uart_port *port)
 {
         struct uart_sunsu_port *up = (struct uart_sunsu_port *) port;
-        unsigned long flags;
 
-        spin_lock_irqsave(&up->port.lock, flags);
         up->ier &= ~UART_IER_RLSI;
         up->port.read_status_mask &= ~UART_LSR_DR;
         serial_out(up, UART_IER, up->ier);
-        spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
 static void sunsu_enable_ms(struct uart_port *port)
diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig
index d95265b187a3..a34731625877 100644
--- a/drivers/sn/Kconfig
+++ b/drivers/sn/Kconfig
@@ -3,10 +3,11 @@
 #
 
 menu "SN Devices"
+        depends on SGI_SN
 
 config SGI_IOC4
         tristate "SGI IOC4 Base IO support"
-        depends on (IA64_GENERIC || IA64_SGI_SN2) && MMTIMER
+        depends on MMTIMER
         default m
         ---help---
         This option enables basic support for the SGI IOC4-based Base IO
@@ -19,7 +20,6 @@ config SGI_IOC4
 
 config SGI_IOC3
         tristate "SGI IOC3 Base IO support"
-        depends on (IA64_GENERIC || IA64_SGI_SN2)
         default m
         ---help---
         This option enables basic support for the SGI IOC3-based Base IO
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c
index 12357e1fa558..93449a1a0065 100644
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
@@ -62,7 +62,7 @@ static int nic_reset(struct ioc3_driver_data *idd)
         return presence;
 }
 
-static inline int nic_read_bit(struct ioc3_driver_data *idd)
+static int nic_read_bit(struct ioc3_driver_data *idd)
 {
         int result;
         unsigned long flags;
@@ -77,7 +77,7 @@ static inline int nic_read_bit(struct ioc3_driver_data *idd)
         return result;
 }
 
-static inline void nic_write_bit(struct ioc3_driver_data *idd, int bit)
+static void nic_write_bit(struct ioc3_driver_data *idd, int bit)
 {
         if (bit)
                 writel(mcr_pack(6, 110), &idd->vma->mcr);
@@ -371,8 +371,7 @@ static void probe_nic(struct ioc3_driver_data *idd)
 
 /* Interrupts */
 
-static inline void
-write_ireg(struct ioc3_driver_data *idd, uint32_t val, int which)
+static void write_ireg(struct ioc3_driver_data *idd, uint32_t val, int which)
 {
         unsigned long flags;
 
@@ -735,14 +734,12 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
         }
 
         /* Add this IOC3 to all submodules */
-        read_lock(&ioc3_submodules_lock);
         for(id=0;id<IOC3_MAX_SUBMODULES;id++)
                 if(ioc3_submodules[id] && ioc3_submodules[id]->probe) {
                         idd->active[id] = 1;
                         idd->active[id] = !ioc3_submodules[id]->probe
                                                 (ioc3_submodules[id], idd);
                 }
-        read_unlock(&ioc3_submodules_lock);
 
         printk(KERN_INFO "IOC3 Master Driver loaded for %s\n", pci_name(pdev));
 
@@ -767,7 +764,6 @@ static void ioc3_remove(struct pci_dev *pdev)
         idd = pci_get_drvdata(pdev);
 
         /* Remove this IOC3 from all submodules */
-        read_lock(&ioc3_submodules_lock);
         for(id=0;id<IOC3_MAX_SUBMODULES;id++)
                 if(idd->active[id]) {
                         if(ioc3_submodules[id] && ioc3_submodules[id]->remove)
@@ -781,7 +777,6 @@ static void ioc3_remove(struct pci_dev *pdev)
                                                 pci_name(pdev));
                         idd->active[id] = 0;
                 }
-        read_unlock(&ioc3_submodules_lock);
 
         /* Clear and disable all IRQs */
         write_ireg(idd, ~0, IOC3_W_IEC);
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index e02fea5a5433..1a362c5e7f3d 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -1062,11 +1062,11 @@ static int lh7a40x_ep_enable(struct usb_ep *_ep,
         ep->pio_irqs = 0;
         ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize);
 
+        spin_unlock_irqrestore(&ep->dev->lock, flags);
+
         /* Reset halt state (does flush) */
         lh7a40x_set_halt(_ep, 0);
 
-        spin_unlock_irqrestore(&ep->dev->lock, flags);
-
         DEBUG("%s: enabled %s\n", __FUNCTION__, _ep->name);
         return 0;
 }
@@ -1775,6 +1775,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr)
                                         break;
 
                                 qep = &dev->ep[ep_num];
+                                spin_unlock(&dev->lock);
                                 if (ctrl.bRequest == USB_REQ_SET_FEATURE) {
                                         DEBUG_SETUP("SET_FEATURE (%d)\n",
                                                     ep_num);
@@ -1784,6 +1785,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr)
                                                     ep_num);
                                         lh7a40x_set_halt(&qep->ep, 0);
                                 }
+                                spin_lock(&dev->lock);
                                 usb_set_index(0);
 
                                 /* Reply with a ZLP on next IN token */
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 9689efeb364c..6d6eaad73968 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -853,11 +853,14 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf)
         // DEBUG("%s: OID = %08X\n", __FUNCTION__, cpu_to_le32(buf->OID));
         if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP;
         
-        /* 
-         * we need more memory: 
-         * oid_supported_list is the largest answer 
+        /*
+         * we need more memory:
+         * gen_ndis_query_resp expects enough space for
+         * rndis_query_cmplt_type followed by data.
+         * oid_supported_list is the largest data reply
          */
-        r = rndis_add_response (configNr, sizeof (oid_supported_list));
+        r = rndis_add_response (configNr,
+                sizeof (oid_supported_list) + sizeof(rndis_query_cmplt_type));
         if (!r)
                 return -ENOMEM;
         resp = (rndis_query_cmplt_type *) r->buf;
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 118288d94423..9e81c26313f9 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -260,12 +260,13 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
                                                 offset + EHCI_USBLEGCTLSTS,
                                                 val | EHCI_USBLEGCTLSTS_SOOE);
 #endif
-                        }
 
-                        /* always say Linux will own the hardware
-                         * by setting EHCI_USBLEGSUP_OS.
-                         */
-                        pci_write_config_byte(pdev, offset + 3, 1);
+                                /* some systems get upset if this semaphore is
+                                 * set for any other reason than forcing a BIOS
+                                 * handoff..
+                                 */
+                                pci_write_config_byte(pdev, offset + 3, 1);
+                        }
 
                         /* if boot firmware now owns EHCI, spin till
                          * it hands it over.
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 772478086bd3..07a012f88772 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1407,6 +1407,7 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_VENDOR_ID_WISEGROUP         0x0925
 #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
 #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
+#define USB_DEVICE_ID_DUAL_USB_JOYPAD   0x8866
 
 #define USB_VENDOR_ID_CODEMERCS         0x07c0
 #define USB_DEVICE_ID_CODEMERCS_IOW40   0x1500
@@ -1577,6 +1578,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
         { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
 
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },
         { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f2b4ca8692d8..c145e1ed8429 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -469,8 +469,14 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
         { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_YS_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_IC_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_DB9_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_RS232_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y9_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },
         { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index ca40f16370f1..bdef3b8c731f 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -333,10 +333,18 @@
 
 /*
  * microHAM product IDs (http://www.microham.com).
- * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>.
+ * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>
+ * and Mike Studer (K6EEP) <k6eep@hamsoftware.org>.
+ * Ian Abbott <abbotti@mev.co.uk> added a few more from the driver INF file.
  */
+#define FTDI_MHAM_KW_PID 0xEEE8         /* USB-KW interface */
+#define FTDI_MHAM_YS_PID 0xEEE9         /* USB-YS interface */
 #define FTDI_MHAM_Y6_PID 0xEEEA         /* USB-Y6 interface */
 #define FTDI_MHAM_Y8_PID 0xEEEB         /* USB-Y8 interface */
+#define FTDI_MHAM_IC_PID 0xEEEC         /* USB-IC interface */
+#define FTDI_MHAM_DB9_PID 0xEEED        /* USB-DB9 interface */
+#define FTDI_MHAM_RS232_PID 0xEEEE      /* USB-RS232 interface */
+#define FTDI_MHAM_Y9_PID 0xEEEF         /* USB-Y9 interface */
 
 /*
  * Active Robots product ids.
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index bce3d55affd8..11a48d874752 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -69,6 +69,8 @@ static struct usb_device_id id_table [] = {
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID),
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
+        { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID),
+                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID),
                 .driver_info = (kernel_ulong_t)&palm_os_4_probe },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID),
@@ -139,6 +141,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO_ID) },
         { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID) },
+        { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) },
         { USB_DEVICE(PALM_VENDOR_ID, PALM_M515_ID) },
diff --git a/drivers/usb/serial/visor.h b/drivers/usb/serial/visor.h
index b84d1cb4c693..765118d83fb6 100644
--- a/drivers/usb/serial/visor.h
+++ b/drivers/usb/serial/visor.h
@@ -36,6 +36,9 @@
 #define PALM_ZIRE_ID                    0x0070
 #define PALM_M100_ID                    0x0080
 
+#define GSPDA_VENDOR_ID         0x115e
+#define GSPDA_XPLORE_M68_ID             0xf100
+
 #define SONY_VENDOR_ID                  0x054C
 #define SONY_CLIE_3_5_ID                0x0038
 #define SONY_CLIE_4_0_ID                0x0066
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index e71c5ca1a07b..31ca92056c27 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -753,6 +753,13 @@ UNUSUAL_DEV(  0x0693, 0x0005, 0x0100, 0x0100,
                 "Flashgate",
                 US_SC_SCSI, US_PR_BULK, NULL, 0 ), 
 
+/* Reported by David Hamilton <niftimusmaximus@lycos.com> */
+UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
+                "Thomson Multimedia Inc.",
+                "RCA RD1080 MP3 Player",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY ),
+
 UNUSUAL_DEV(  0x0781, 0x0001, 0x0200, 0x0200, 
                 "Sandisk",
                 "ImageMate SDDR-05a",