Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e9a4b71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  [PATCH] USB: ftdi_sio: add support for ASK RDR 400 series card reader
  [PATCH] USB: ftdi_sio: Adds support for iPlus device.
  [PATCH] USB: ftdi_sio vendor code for RR-CirKits LocoBuffer USB
  [PATCH] USB: Use new PCI_CLASS_SERIAL_USB_* defines
  [PATCH] USB: net2280: set driver data before it is used
  [PATCH] USB: net2280: check for shared IRQs
  [PATCH] USB: net2280: send 0-length packets for ep0
  [PATCH] USB: net2280: Handle STALLs for 0-length control-IN requests
  [PATCH] USB: storage: atmel unusual dev update
  [PATCH] USB: Storage: unusual devs update
  [PATCH] USB: add new iTegno usb CDMA 1x card support for pl2303
  [PATCH] USB: Resource leak fix for whiteheat driver
parents 2cb14596 7e0258fd

arch/powerpc/platforms/powermac/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ pmac_pci_enable_device_hook(struct pci_dev *dev, int initial) 
	 * (iBook second controller)

	 */

	if (dev->vendor == PCI_VENDOR_ID_APPLE

	    && (dev->class == ((PCI_CLASS_SERIAL_USB << 8) | 0x10))

	    && dev->class == PCI_CLASS_SERIAL_USB_OHCI

	    && !node) {

		printk(KERN_INFO "Apple USB OHCI %s disabled by firmware\n",

		       pci_name(dev));

drivers/usb/gadget/net2280.c

+8 −7
Original line number Diff line number Diff line
@@ -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);

drivers/usb/host/ehci-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */ }

drivers/usb/host/ohci-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */ }

};

drivers/usb/host/uhci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */ }

};