11 files changed, 41 insertions, 100 deletions

diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 6a4b93ad10..0b92934939 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2166,7 +2166,7 @@ static void handle_ep_small (struct net2280_ep *ep)
                                         ep->stopped = 1;
                                         set_halt (ep);
                                         mode = 2;
-                                } else if (!req && ep->stopped)
+                                } else if (!req && !ep->stopped)
                                         write_fifo (ep, NULL);
                         }
                 } else {
@@ -2280,9 +2280,7 @@ static void handle_ep_small (struct net2280_ep *ep)
                 /* if we wrote it all, we're usually done */
                 if (req->req.actual == req->req.length) {
                         if (ep->num == 0) {
-                                /* wait for control status */
-                                if (mode != 2)
-                                        req = NULL;
+                                /* send zlps until the status stage */
                         } else if (!req->req.zero || len != ep->ep.maxpacket)
                                 mode = 2;
                 }
@@ -2744,6 +2742,10 @@ static irqreturn_t net2280_irq (int irq, void *_dev, struct pt_regs * r)
 {
         struct net2280          *dev = _dev;
 
+        /* shared interrupt, not ours */
+        if (!(readl(&dev->regs->irqstat0) & (1 << INTA_ASSERTED)))
+                return IRQ_NONE;
+
         spin_lock (&dev->lock);
 
         /* handle disconnect, dma, and more */
@@ -2831,13 +2833,13 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* alloc, and start init */
-        dev = kmalloc (sizeof *dev, SLAB_KERNEL);
+        dev = kzalloc (sizeof *dev, SLAB_KERNEL);
         if (dev == NULL){
                 retval = -ENOMEM;
                 goto done;
         }
 
-        memset (dev, 0, sizeof *dev);
+        pci_set_drvdata (pdev, dev);
         spin_lock_init (&dev->lock);
         dev->pdev = pdev;
         dev->gadget.ops = &net2280_ops;
@@ -2950,7 +2952,6 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
         dev->chiprev = get_idx_reg (dev->regs, REG_CHIPREV) & 0xffff;
 
         /* done */
-        pci_set_drvdata (pdev, dev);
         INFO (dev, "%s\n", driver_desc);
         INFO (dev, "irq %s, pci mem %p, chip rev %04x\n",
                         bufp, base, dev->chiprev);
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 1e03f1a5a5..a1bd2bea6d 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -350,7 +350,7 @@ static const struct hc_driver ehci_pci_hc_driver = {
 /* PCI driver selection metadata; PCI hotplugging uses this */
 static const struct pci_device_id pci_ids [] = { {
         /* handle any USB 2.0 EHCI controller */
-        PCI_DEVICE_CLASS(((PCI_CLASS_SERIAL_USB << 8) | 0x20), ~0),
+        PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
         .driver_data =  (unsigned long) &ehci_pci_hc_driver,
         },
         { /* end: all zeroes */ }
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 1bfe96f4d0..b268537e38 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -206,7 +206,7 @@ static const struct hc_driver ohci_pci_hc_driver = {
 
 static const struct pci_device_id pci_ids [] = { {
         /* handle any USB OHCI controller */
-        PCI_DEVICE_CLASS((PCI_CLASS_SERIAL_USB << 8) | 0x10, ~0),
+        PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
         .driver_data =  (unsigned long) &ohci_pci_hc_driver,
         }, { /* end: all zeroes */ }
 };
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index c0c4db78b5..d225e11f40 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -858,7 +858,7 @@ static const struct hc_driver uhci_driver = {
 
 static const struct pci_device_id uhci_pci_ids[] = { {
         /* handle any USB UHCI controller */
-        PCI_DEVICE_CLASS(((PCI_CLASS_SERIAL_USB << 8) | 0x00), ~0),
+        PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
         .driver_data =  (unsigned long) &uhci_driver,
         }, { /* end: all zeroes */ }
 };
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index f5851db67f..82151207d8 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -308,6 +308,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = {
 
 static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) },
@@ -493,6 +494,8 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
         { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
         { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
         { },                                    /* Optional parameter entry */
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 2155f0e4a3..2c55a5ea9c 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -39,6 +39,9 @@
 /* www.thoughttechnology.com/ TT-USB provide with procomp use ftdi_sio */
 #define FTDI_TTUSB_PID 0xFF20 /* Product Id */
 
+/* iPlus device */
+#define FTDI_IPLUS_PID 0xD070 /* Product Id */
+
 /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */
 /* they use the ftdi chipset for the USB interface and the vendor id is the same */
 #define FTDI_XF_632_PID 0xFC08  /* 632: 16x2 Character Display */
@@ -153,6 +156,11 @@
 #define ICOM_ID1_PID            0x0004
 
 /*
+ * ASK.fr devices
+ */
+#define FTDI_ASK_RDR400_PID     0xC991  /* ASK RDR 400 series card reader */
+
+/*
  * DSS-20 Sync Station for Sony Ericsson P800
  */
  
@@ -400,6 +408,11 @@
 #define FTDI_WESTREX_MODEL_8900F_PID    0xDC01  /* Model 8900F */
 
 /*
+ * RR-CirKits LocoBuffer USB (http://www.rr-cirkits.com)
+ */
+#define FTDI_RRCIRKITS_LOCOBUFFER_PID   0xc7d0  /* LocoBuffer USB */
+
+/*
  * Eclo (http://www.eclo.pt/) product IDs.
  * PID 0xEA90 submitted by Martin Grill.
  */
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index ccf746b27d..c96714bb1c 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -61,6 +61,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) },
         { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID_UCSGT) },
         { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID) },
+        { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) },
         { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) },
         { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) },
         { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) },
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 09f379b19e..7f29e81d3e 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -26,6 +26,7 @@
 
 #define ITEGNO_VENDOR_ID        0x0eba
 #define ITEGNO_PRODUCT_ID       0x1080
+#define ITEGNO_PRODUCT_ID_2080  0x2080
 
 #define MA620_VENDOR_ID         0x0df7
 #define MA620_PRODUCT_ID        0x0620
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 557411c6e7..f806553cd9 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -508,6 +508,7 @@ no_firmware:
         err("%s: Unable to retrieve firmware version, try replugging\n", serial->type->description);
         err("%s: If the firmware is not running (status led not blinking)\n", serial->type->description);
         err("%s: please contact support@connecttech.com\n", serial->type->description);
+        kfree(result);
         return -ENODEV;
 
 no_command_private:
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index c4a9dcff5f..aec5ea8682 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -411,7 +411,7 @@ UNUSUAL_DEV(  0x050d, 0x0115, 0x0133, 0x0133,
 UNUSUAL_DEV(  0x0525, 0xa140, 0x0100, 0x0100,
                 "Iomega",
                 "USB Clik! 40",
-                US_SC_8070, US_PR_BULK, NULL,
+                US_SC_8070, US_PR_DEVICE, NULL,
                 US_FL_FIX_INQUIRY ),
 
 /* Yakumo Mega Image 37
@@ -773,6 +773,13 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY ),
 
+/* Reported by Olivier Blondeau <zeitoun@gmail.com> */
+UNUSUAL_DEV(  0x0727, 0x0306, 0x0100, 0x0100,
+                "ATMEL",
+                "SND1 Storage",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE),
+
 /* Submitted by Roman Hodek <roman@hodek.net> */
 UNUSUAL_DEV(  0x0781, 0x0001, 0x0200, 0x0200,
                 "Sandisk",
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index b72b05250a..34e0739975 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -305,94 +305,6 @@ static ssize_t show_stride(struct class_device *class_device, char *buf)
         return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length);
 }
 
-/* Format for cmap is "%02x%c%4x%4x%4x\n" */
-/* %02x entry %c transp %4x red %4x blue %4x green \n */
-/* 256 rows at 16 chars equals 4096, the normal page size */
-/* the code will automatically adjust for different page sizes */
-static ssize_t store_cmap(struct class_device *class_device, const char *buf,
-                          size_t count)
-{
-        struct fb_info *fb_info = class_get_devdata(class_device);
-        int rc, i, start, length, transp = 0;
-
-        if ((count > PAGE_SIZE) || ((count % 16) != 0))
-                return -EINVAL;
-
-        if (!fb_info->fbops->fb_setcolreg && !fb_info->fbops->fb_setcmap)
-                return -EINVAL;
-
-        sscanf(buf, "%02x", &start);
-        length = count / 16;
-
-        for (i = 0; i < length; i++)
-                if (buf[i * 16 + 2] != ' ')
-                        transp = 1;
-
-        /* If we can batch, do it */
-        if (fb_info->fbops->fb_setcmap && length > 1) {
-                struct fb_cmap umap;
-
-                memset(&umap, 0, sizeof(umap));
-                if ((rc = fb_alloc_cmap(&umap, length, transp)))
-                        return rc;
-
-                umap.start = start;
-                for (i = 0; i < length; i++) {
-                        sscanf(&buf[i * 16 +  3], "%4hx", &umap.red[i]);
-                        sscanf(&buf[i * 16 +  7], "%4hx", &umap.blue[i]);
-                        sscanf(&buf[i * 16 + 11], "%4hx", &umap.green[i]);
-                        if (transp)
-                                umap.transp[i] = (buf[i * 16 +  2] != ' ');
-                }
-                rc = fb_info->fbops->fb_setcmap(&umap, fb_info);
-                fb_copy_cmap(&umap, &fb_info->cmap);
-                fb_dealloc_cmap(&umap);
-
-                return rc ?: count;
-        }
-        for (i = 0; i < length; i++) {
-                u16 red, blue, green, tsp;
-
-                sscanf(&buf[i * 16 +  3], "%4hx", &red);
-                sscanf(&buf[i * 16 +  7], "%4hx", &blue);
-                sscanf(&buf[i * 16 + 11], "%4hx", &green);
-                tsp = (buf[i * 16 +  2] != ' ');
-                if ((rc = fb_info->fbops->fb_setcolreg(start++,
-                                      red, green, blue, tsp, fb_info)))
-                        return rc;
-
-                fb_info->cmap.red[i] = red;
-                fb_info->cmap.blue[i] = blue;
-                fb_info->cmap.green[i] = green;
-                if (transp)
-                        fb_info->cmap.transp[i] = tsp;
-        }
-        return count;
-}
-
-static ssize_t show_cmap(struct class_device *class_device, char *buf)
-{
-        struct fb_info *fb_info = class_get_devdata(class_device);
-        unsigned int i;
-
-        if (!fb_info->cmap.red || !fb_info->cmap.blue ||
-           !fb_info->cmap.green)
-                return -EINVAL;
-
-        if (fb_info->cmap.len > PAGE_SIZE / 16)
-                return -EINVAL;
-
-        /* don't mess with the format, the buffer is PAGE_SIZE */
-        /* 256 entries at 16 chars per line equals 4096 = PAGE_SIZE */
-        for (i = 0; i < fb_info->cmap.len; i++) {
-                snprintf(&buf[ i * 16], PAGE_SIZE - i * 16, "%02x%c%4x%4x%4x\n", i + fb_info->cmap.start,
-                        ((fb_info->cmap.transp && fb_info->cmap.transp[i]) ? '*' : ' '),
-                        fb_info->cmap.red[i], fb_info->cmap.blue[i],
-                        fb_info->cmap.green[i]);
-        }
-        return 16 * fb_info->cmap.len;
-}
-
 static ssize_t store_blank(struct class_device *class_device, const char * buf,
                            size_t count)
 {
@@ -502,10 +414,12 @@ static ssize_t show_fbstate(struct class_device *class_device, char *buf)
         return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state);
 }
 
+/* When cmap is added back in it should be a binary attribute
+ * not a text one. Consideration should also be given to converting
+ * fbdev to use configfs instead of sysfs */
 static struct class_device_attribute class_device_attrs[] = {
         __ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp),
         __ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank),
-        __ATTR(color_map, S_IRUGO|S_IWUSR, show_cmap, store_cmap),
         __ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console),
         __ATTR(cursor, S_IRUGO|S_IWUSR, show_cursor, store_cursor),
         __ATTR(mode, S_IRUGO|S_IWUSR, show_mode, store_mode),