Commit 4c1f683a 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: (28 commits)
  MAINTAINERS: add a maintainer to Gadget Framework
  USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver
  Revert "USB: option: add ID for ZTE MF 330"
  drivers/usb/host/ohci-pxa27x.c: add missing clk_put
  USB: CONFIG_USB_GADGET_DUALSPEED is not user-configurable
  USB: dummy-hcd needs the has_tt flag
  usb-storage: redo incorrect reads
  usb/renesas_usbhs: free uep on removal
  usb/s3c-hsudc: fix error path
  usb/pxa25x_udc: cleanup the LUBBOCK err path
  usb/mv_udc_core: fix compile
  usb: gadget: include <linux/prefetch.h> to fix compiling error
  USB: s3c-hsotg: Tone down debugging
  usb: remove bad dput after dentry_unhash
  USB: core: Tolerate protocol stall during hub and port status read
  musb: fix prefetch build failure
  USB: cdc-acm: Adding second ACM channel support for Nokia E7 and C7
  usb-gadget: unlock data->lock mutex on error path in ep_write()
  USB: option Add blacklist for ZTE K3765-Z (19d2:2002)
  option: add Prolink PH300 modem IDs
  ...
parents 365a13a5 d6d0f665

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -2598,6 +2598,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					unlock ejectable media);

				m = MAX_SECTORS_64 (don't transfer more

					than 64 sectors = 32 KB at a time);

				n = INITIAL_READ10 (force a retry of the

					initial READ(10) command);

				o = CAPACITY_OK (accept the capacity

					reported by the device);

				r = IGNORE_RESIDUE (the device reports

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -6444,9 +6444,11 @@ S: Maintained 
F:	drivers/media/video/et61x251/



USB GADGET/PERIPHERAL SUBSYSTEM

M:	Felipe Balbi <balbi@ti.com>

L:	linux-usb@vger.kernel.org

W:	http://www.linux-usb.org/gadget

S:	Orphan

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Maintained

F:	drivers/usb/gadget/

F:	include/linux/usb/gadget*

drivers/usb/class/cdc-acm.c

+2 −0
Original line number Diff line number Diff line
@@ -1530,6 +1530,8 @@ static const struct usb_device_id acm_ids[] = { 
	{ NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */

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

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

	{ NOKIA_PCSUITE_ACM_INFO(0x0335), }, /* Nokia E7 */

	{ NOKIA_PCSUITE_ACM_INFO(0x03cd), }, /* Nokia C7 */

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



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

drivers/usb/core/hub.c

+4 −2
Original line number Diff line number Diff line
@@ -339,7 +339,8 @@ static int get_hub_status(struct usb_device *hdev, 
{

	int i, status = -ETIMEDOUT;



	for (i = 0; i < USB_STS_RETRIES && status == -ETIMEDOUT; i++) {

	for (i = 0; i < USB_STS_RETRIES &&

			(status == -ETIMEDOUT || status == -EPIPE); i++) {

		status = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),

			USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_HUB, 0, 0,

			data, sizeof(*data), USB_STS_TIMEOUT);
@@ -355,7 +356,8 @@ static int get_port_status(struct usb_device *hdev, int port1, 
{

	int i, status = -ETIMEDOUT;



	for (i = 0; i < USB_STS_RETRIES && status == -ETIMEDOUT; i++) {

	for (i = 0; i < USB_STS_RETRIES &&

			(status == -ETIMEDOUT || status == -EPIPE); i++) {

		status = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),

			USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port1,

			data, sizeof(*data), USB_STS_TIMEOUT);

drivers/usb/gadget/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -632,13 +632,10 @@ config USB_DUMMY_HCD 


endchoice



# Selected by UDC drivers that support high-speed operation.

config USB_GADGET_DUALSPEED

	bool

	depends on USB_GADGET

	default n

	help

	  Means that gadget drivers should include extra descriptors

	  and code to handle dual-speed controllers.



#

# USB Gadget Drivers

CRA Git | Maintained and supported by SUSTech CRA and CCSE