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

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

Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits)
  usb: gadget: composite: avoid access beyond array max length
  USB: serial: handle Data Carrier Detect changes
  USB: gadget: Fix endpoint representation in ci13xxx_udc
  USB: gadget: Fix error path in ci13xxx_udc gadget probe function
  usb: pch_udc: Fix the worning log issue at gadget driver remove
  USB: serial: Updated support for ICOM devices
  USB: ehci-mxc: add work-around for efika mx/sb bug
  USB: unbreak ehci-mxc on otg port of i.MX27
  drivers: update to pl2303 usb-serial to support Motorola cables
  USB: adding USB support for Cinterion's HC2x, EU3 and PH8 products
  USB serial: add missing .usb_driver field in serial drivers
  USB: ehci-fsl: Fix 'have_sysif_regs' detection
  USB: g_printer: fix bug in module parameter definitions
  USB: g_printer: fix bug in unregistration
  USB: uss720: remove duplicate USB device
  MAINTAINERS: add ueagle-atm entry
  USB: EHCI: fix DMA deallocation bug
  USB: pch_udc: support new device ML7213 IOH
  usb: pch_udc: Fixed issue which does not work with g_serial
  usb: set ep_dev async suspend should be later than device_initialize
  ...
parents fb1c6348 fd96d0d8

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3139,6 +3139,12 @@ S: Maintained 
F:	net/ieee802154/

F:	drivers/ieee802154/



IKANOS/ADI EAGLE ADSL USB DRIVER

M:	Matthieu Castet <castet.matthieu@free.fr>

M:	Stanislaw Gruszka <stf_xl@wp.pl>

S:	Maintained

F:	drivers/usb/atm/ueagle-atm.c



INTEGRITY MEASUREMENT ARCHITECTURE (IMA)

M:	Mimi Zohar <zohar@us.ibm.com>

S:	Supported

drivers/usb/class/cdc-wdm.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static ssize_t wdm_write 
		goto outnp;

	}



	if (!file->f_flags && O_NONBLOCK)

	if (!(file->f_flags & O_NONBLOCK))

		r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,

								&desc->flags));

	else

drivers/usb/core/endpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -192,12 +192,12 @@ int usb_create_ep_devs(struct device *parent, 
	ep_dev->dev.parent = parent;

	ep_dev->dev.release = ep_device_release;

	dev_set_name(&ep_dev->dev, "ep_%02x", endpoint->desc.bEndpointAddress);

	device_enable_async_suspend(&ep_dev->dev);



	retval = device_register(&ep_dev->dev);

	if (retval)

		goto error_register;



	device_enable_async_suspend(&ep_dev->dev);

	endpoint->ep_dev = ep_dev;

	return retval;

drivers/usb/core/hcd-pci.c

+6 −1
Original line number Diff line number Diff line
@@ -405,6 +405,11 @@ static int suspend_common(struct device *dev, bool do_wakeup) 
			return retval;

	}



	/* If MSI-X is enabled, the driver will have synchronized all vectors

	 * in pci_suspend(). If MSI or legacy PCI is enabled, that will be

	 * synchronized here.

	 */

	if (!hcd->msix_enabled)

		synchronize_irq(pci_dev->irq);



	/* Downstream ports from this root hub should already be quiesced, so

drivers/usb/core/hub.c

+21 −0
Original line number Diff line number Diff line
@@ -676,6 +676,8 @@ static void hub_init_func3(struct work_struct *ws); 
static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)

{

	struct usb_device *hdev = hub->hdev;

	struct usb_hcd *hcd;

	int ret;

	int port1;

	int status;

	bool need_debounce_delay = false;
@@ -714,6 +716,25 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) 
			usb_autopm_get_interface_no_resume(

					to_usb_interface(hub->intfdev));

			return;		/* Continues at init2: below */

		} else if (type == HUB_RESET_RESUME) {

			/* The internal host controller state for the hub device

			 * may be gone after a host power loss on system resume.

			 * Update the device's info so the HW knows it's a hub.

			 */

			hcd = bus_to_hcd(hdev->bus);

			if (hcd->driver->update_hub_device) {

				ret = hcd->driver->update_hub_device(hcd, hdev,

						&hub->tt, GFP_NOIO);

				if (ret < 0) {

					dev_err(hub->intfdev, "Host not "

							"accepting hub info "

							"update.\n");

					dev_err(hub->intfdev, "LS/FS devices "

							"and hubs may not work "

							"under this hub\n.");

				}

			}

			hub_power_on(hub, true);

		} else {

			hub_power_on(hub, true);

		}