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

Commit b939e414 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  Revert "USB: Correct Makefile to make isp1760 buildable"
  usb-serial: fix crash when sub-driver updates firmware
  USB: isp1760: urb_dequeue doesn't always find the urbs
  USB: Yet another Conexant Clone to add to cdc-acm.c
  USB: atmel_usb_udc: Use kzalloc() to allocate ep structures
  USB: atmel-usba-udc : fix control out requests.
parents deeb1034 29868b28

drivers/usb/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ obj-$(CONFIG_USB_MON) += mon/ 
obj-$(CONFIG_PCI)		+= host/

obj-$(CONFIG_USB_EHCI_HCD)	+= host/

obj-$(CONFIG_USB_ISP116X_HCD)	+= host/

obj-$(CONFIG_USB_ISP1760_HCD)	+= host/

obj-$(CONFIG_USB_OHCI_HCD)	+= host/

obj-$(CONFIG_USB_UHCI_HCD)	+= host/

obj-$(CONFIG_USB_FHCI_HCD)	+= host/

drivers/usb/class/cdc-acm.c

+3 −0
Original line number Diff line number Diff line
@@ -1375,6 +1375,9 @@ static struct usb_device_id acm_ids[] = { 
	{ USB_DEVICE(0x0572, 0x1324), /* Conexant USB MODEM RD02-D400 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */

	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */

	},

	{ USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */

	},

	{ USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */

drivers/usb/gadget/atmel_usba_udc.c

+3 −2
Original line number Diff line number Diff line
@@ -794,7 +794,8 @@ usba_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) 
	if (ep->desc) {

		list_add_tail(&req->queue, &ep->queue);



		if (ep->is_in || (ep_is_control(ep)

		if ((!ep_is_control(ep) && ep->is_in) ||

			(ep_is_control(ep)

				&& (ep->state == DATA_STAGE_IN

					|| ep->state == STATUS_STAGE_IN)))

			usba_ep_writel(ep, CTL_ENB, USBA_TX_PK_RDY);
@@ -1940,7 +1941,7 @@ static int __init usba_udc_probe(struct platform_device *pdev) 
	usba_writel(udc, CTRL, USBA_DISABLE_MASK);

	clk_disable(pclk);



	usba_ep = kmalloc(sizeof(struct usba_ep) * pdata->num_ep,

	usba_ep = kzalloc(sizeof(struct usba_ep) * pdata->num_ep,

			  GFP_KERNEL);

	if (!usba_ep)

		goto err_alloc_ep;

drivers/usb/host/isp1760-hcd.c

+22 −2
Original line number Diff line number Diff line
@@ -1658,6 +1658,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, 
	u32 reg_base, or_reg, skip_reg;

	unsigned long flags;

	struct ptd ptd;

	packet_enqueue *pe;



	switch (usb_pipetype(urb->pipe)) {

	case PIPE_ISOCHRONOUS:
@@ -1669,6 +1670,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, 
		reg_base = INT_REGS_OFFSET;

		or_reg = HC_INT_IRQ_MASK_OR_REG;

		skip_reg = HC_INT_PTD_SKIPMAP_REG;

		pe = enqueue_an_INT_packet;

		break;



	default:
@@ -1676,6 +1678,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, 
		reg_base = ATL_REGS_OFFSET;

		or_reg = HC_ATL_IRQ_MASK_OR_REG;

		skip_reg = HC_ATL_PTD_SKIPMAP_REG;

		pe =  enqueue_an_ATL_packet;

		break;

	}
@@ -1687,6 +1690,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, 
			u32 skip_map;

			u32 or_map;

			struct isp1760_qtd *qtd;

			struct isp1760_qh *qh = ints->qh;



			skip_map = isp1760_readl(hcd->regs + skip_reg);

			skip_map |= 1 << i;
@@ -1699,8 +1703,7 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, 
			priv_write_copy(priv, (u32 *)&ptd, hcd->regs + reg_base

					+ i * sizeof(ptd), sizeof(ptd));

			qtd = ints->qtd;



			clean_up_qtdlist(qtd);

			qtd = clean_up_qtdlist(qtd);



			free_mem(priv, ints->payload);
@@ -1711,6 +1714,23 @@ static int isp1760_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, 
			ints->payload = 0;



			isp1760_urb_done(priv, urb, status);

			if (qtd)

				pe(hcd, qh, qtd);

			break;



		} else if (ints->qtd) {

			struct isp1760_qtd *qtd, *prev_qtd = ints->qtd;



			for (qtd = ints->qtd->hw_next; qtd; qtd = qtd->hw_next) {

				if (qtd->urb == urb) {

					prev_qtd->hw_next = clean_up_qtdlist(qtd);

					isp1760_urb_done(priv, urb, status);

					break;

				}

				prev_qtd = qtd;

			}

			/* we found the urb before the end of the list */

			if (qtd)

				break;

		}

		ints++;

drivers/usb/serial/usb-serial.c

+1 −0
Original line number Diff line number Diff line
@@ -974,6 +974,7 @@ int usb_serial_probe(struct usb_interface *interface, 
		if (retval > 0) {

			/* quietly accept this device, but don't bind to a

			   serial port as it's about to disappear */

			serial->num_ports = 0;

			goto exit;

		}

	}