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

Commit 67d01952 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: (21 commits)
  USB: cdc-acm: Adding second ACM channel support for Nokia N8
  USB, Mass Storage, composite, gadget: Fix build failure and memset of a struct
  USB: Fix trout build failure with ci13xxx_msm gadget
  USB: EHCI: fix scheduling while atomic during suspend
  USB: usb-storage: unusual_devs entry for Coby MP3 player
  USB: ftdi_sio: Add VID=0x0647, PID=0x0100 for Acton Research spectrograph
  USB: fix race between root-hub resume and wakeup requests
  USB: prevent buggy hubs from crashing the USB stack
  usb: r8a66597-udc: Fixed bufnum of Bulk
  USB: ftdi_sio: add ST Micro Connect Lite uart support
  USB: Storage: Add unusual_devs entry for VTech Kidizoom
  USB SL811HS HCD: Fix memory leak in sl811h_urb_enqueue()
  USB: ti_usb: fix module removal
  USB: io_edgeport: fix the reported firmware major and minor
  usb: ehci-omap: Show fatal probing time errors to end user
  usb: musb: introduce api for dma code to check compatibility with usb request
  usb: musb: maintain three states for buffer mappings instead of two
  usb: musb: disable double buffering when it's broken
  usb: musb: hsdma: change back to use musb_read/writew
  usb: musb: core: fix IRQ check
  ...
parents ce86d35d 721d92fc

drivers/usb/class/cdc-acm.c

+1 −0
Original line number Diff line number Diff line
@@ -1607,6 +1607,7 @@ static const struct usb_device_id acm_ids[] = { 
	{ NOKIA_PCSUITE_ACM_INFO(0x0154), }, /* Nokia 5800 XpressMusic */

	{ NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */

	{ NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */

	{ NOKIA_PCSUITE_ACM_INFO(0x0302), }, /* Nokia N8 */

	{ SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */



	/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */

drivers/usb/core/hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -1955,7 +1955,6 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) 


	dev_dbg(&rhdev->dev, "usb %s%s\n",

			(msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");

	clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);

	if (!hcd->driver->bus_resume)

		return -ENOENT;

	if (hcd->state == HC_STATE_RUNNING)
@@ -1963,6 +1962,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) 


	hcd->state = HC_STATE_RESUMING;

	status = hcd->driver->bus_resume(hcd);

	clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);

	if (status == 0) {

		/* TRSMRCY = 10 msec */

		msleep(10);

drivers/usb/core/hub.c

+5 −0
Original line number Diff line number Diff line
@@ -2753,6 +2753,11 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
		udev->ttport = hdev->ttport;

	} else if (udev->speed != USB_SPEED_HIGH

			&& hdev->speed == USB_SPEED_HIGH) {

		if (!hub->tt.hub) {

			dev_err(&udev->dev, "parent hub has no TT\n");

			retval = -EINVAL;

			goto fail;

		}

		udev->tt = &hub->tt;

		udev->ttport = port1;

	}

drivers/usb/gadget/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -546,6 +546,8 @@ config USB_GADGET_CI13XXX_MSM 
	  ci13xxx_udc core.

	  This driver depends on OTG driver for PHY initialization,

	  clock management, powering up VBUS, and power management.

	  This driver is not supported on boards like trout which

	  has an external PHY.



	  Say "y" to link the driver statically, or "m" to build a

	  dynamically linked module called "ci13xxx_msm" and force all

drivers/usb/gadget/f_mass_storage.c

+2 −1
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ 


#include <linux/usb/ch9.h>

#include <linux/usb/gadget.h>

#include <linux/usb/composite.h>



#include "gadget_chips.h"
@@ -2763,7 +2764,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, 
			return ERR_PTR(-ENOMEM);

		common->free_storage_on_release = 1;

	} else {

		memset(common, 0, sizeof common);

		memset(common, 0, sizeof *common);

		common->free_storage_on_release = 0;

	}