Commit fb478da5 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: (23 commits)
  USB: revert recovery from transient errors
  usb: unusual devs patch for Nokia 5310 Music Xpress
  usb: ftdi_sio: add support for Domintell devices
  USB: drivers/usb/musb/: disable it on SuperH
  USB Serial: Sierra: Add MC8785 VID/PID
  USB: serial: add ZTE CDMA Tech id to option driver
  USB: ftdi_sio: Add 0x5050/0x0900 USB IDs (Papouch Quido USB 4/4)
  usb serial: ti_usb_3410_5052 obviously broken by firmware changes
  USB: fsl_usb2_udc: fix VDBG() format string
  USB: unusual_devs addition for RockChip MP3 player
  USB: SERIAL CP2101 add device IDs
  usb-serial: Add Siemens EF81 to PL-2303 hack triggers
  USB: fix EHCI periodic transfers
  usb: musb: fix include path
  USB: Fixing Nokia 3310c in storage mode
  usb gadget: fix omap_udc DMA regression
  USB: update of Documentation/usb/anchors.txt
  USB: fix hcd interrupt disabling
  USB: Correct Sierra Wireless USB EVDO Modem Device ID
  USB: Fix the Nokia 6300 storage-mode.
  ...
parents 8553f321 5257d97a

Documentation/usb/anchors.txt

+12 −0
Original line number Diff line number Diff line
@@ -42,9 +42,21 @@ This function kills all URBs associated with an anchor. The URBs 
are called in the reverse temporal order they were submitted.

This way no data can be reordered.



usb_unlink_anchored_urbs()

--------------------------



This function unlinks all URBs associated with an anchor. The URBs

are processed in the reverse temporal order they were submitted.

This is similar to usb_kill_anchored_urbs(), but it will not sleep.

Therefore no guarantee is made that the URBs have been unlinked when

the call returns. They may be unlinked later but will be unlinked in

finite time.



usb_wait_anchor_empty_timeout()

-------------------------------



This function waits for all URBs associated with an anchor to finish

or a timeout, whichever comes first. Its return value will tell you

whether the timeout was reached.

drivers/usb/core/hcd.c

+2 −1
Original line number Diff line number Diff line
@@ -1876,6 +1876,7 @@ int usb_add_hcd(struct usb_hcd *hcd, 
		 * with IRQF_SHARED. As usb_hcd_irq() will always disable

		 * interrupts we can remove it here.

		 */

		if (irqflags & IRQF_SHARED)

			irqflags &= ~IRQF_DISABLED;



		snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",

drivers/usb/core/hub.c

+17 −22
Original line number Diff line number Diff line
@@ -2683,35 +2683,17 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 
				USB_PORT_STAT_C_ENABLE);

#endif



	/* Try to use the debounce delay for protection against

	 * port-enable changes caused, for example, by EMI.

	 */

	if (portchange & (USB_PORT_STAT_C_CONNECTION |

				USB_PORT_STAT_C_ENABLE)) {

		status = hub_port_debounce(hub, port1);

		if (status < 0) {

			if (printk_ratelimit())

				dev_err (hub_dev, "connect-debounce failed, "

						"port %d disabled\n", port1);

			portstatus &= ~USB_PORT_STAT_CONNECTION;

		} else {

			portstatus = status;

		}

	}



	/* Try to resuscitate an existing device */

	udev = hdev->children[port1-1];

	if ((portstatus & USB_PORT_STAT_CONNECTION) && udev &&

			udev->state != USB_STATE_NOTATTACHED) {



		usb_lock_device(udev);

		if (portstatus & USB_PORT_STAT_ENABLE) {

			status = 0;		/* Nothing to do */

		} else if (!udev->persist_enabled) {

			status = -ENODEV;	/* Mustn't resuscitate */



#ifdef CONFIG_USB_SUSPEND

		} else if (udev->state == USB_STATE_SUSPENDED) {

		} else if (udev->state == USB_STATE_SUSPENDED &&

				udev->persist_enabled) {

			/* For a suspended device, treat this as a

			 * remote wakeup event.

			 */
@@ -2726,7 +2708,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 
#endif



		} else {

			status = usb_reset_device(udev);

			status = -ENODEV;	/* Don't resuscitate */

		}

		usb_unlock_device(udev);
@@ -2741,6 +2723,19 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 
		usb_disconnect(&hdev->children[port1-1]);

	clear_bit(port1, hub->change_bits);



	if (portchange & (USB_PORT_STAT_C_CONNECTION |

				USB_PORT_STAT_C_ENABLE)) {

		status = hub_port_debounce(hub, port1);

		if (status < 0) {

			if (printk_ratelimit())

				dev_err(hub_dev, "connect-debounce failed, "

						"port %d disabled\n", port1);

			portstatus &= ~USB_PORT_STAT_CONNECTION;

		} else {

			portstatus = status;

		}

	}



	/* Return now if debouncing failed or nothing is connected */

	if (!(portstatus & USB_PORT_STAT_CONNECTION)) {

drivers/usb/gadget/fsl_usb2_udc.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int dr_controller_setup(struct fsl_udc *udc) 
	fsl_writel(tmp, &dr_regs->endpointlistaddr);



	VDBG("vir[qh_base] is %p phy[qh_base] is 0x%8x reg is 0x%8x",

		(int)udc->ep_qh, (int)tmp,

		udc->ep_qh, (int)tmp,

		fsl_readl(&dr_regs->endpointlistaddr));



	/* Config PHY interface */

drivers/usb/gadget/omap_udc.c

+2 −2
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel) 
			omap_set_dma_dest_params(ep->lch,

				OMAP_DMA_PORT_TIPB,

				OMAP_DMA_AMODE_CONSTANT,

				(unsigned long) io_v2p(UDC_DATA_DMA),

				UDC_DATA_DMA,

				0, 0);

		}

	} else {
@@ -804,7 +804,7 @@ static void dma_channel_claim(struct omap_ep *ep, unsigned channel) 
			omap_set_dma_src_params(ep->lch,

				OMAP_DMA_PORT_TIPB,

				OMAP_DMA_AMODE_CONSTANT,

				(unsigned long) io_v2p(UDC_DATA_DMA),

				UDC_DATA_DMA,

				0, 0);

			/* EMIFF or SDRC */

			omap_set_dma_dest_burst_mode(ep->lch,

CRA Git | Maintained and supported by SUSTech CRA and CCSE