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

Commit 42bf3e27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 



Pull USB fixes from Greg Kroah-Hartman:
 "Here are the USB patches against your 3.7-rc1 tree.

  There are the usual UABI header file movements, and we finally are now
  able to remove the dbg() macro that is over 15 years old (that had to
  wait for after some other trees got merged into yours during the big
  3.7-rc1 merge window.)

  Other than that, nothing major, just a number of bugfixes and new
  device ids.  It turns out that almost all of the usb-serial drivers
  had bugs in how they were handling their internal data, leaking
  memory, hence all of those fixups.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (42 commits)
  USB: option: add more ZTE devices
  USB: option: blacklist net interface on ZTE devices
  usb: host: xhci: New system added for Compliance Mode Patch on SN65LVPE502CP
  USB: io_ti: fix sysfs-attribute creation
  USB: iuu_phoenix: fix sysfs-attribute creation
  USB: spcp8x5: fix port-data memory leak
  USB: ssu100: fix port-data memory leak
  USB: ti_usb_3410_5052: fix port-data memory leak
  USB: oti6858: fix port-data memory leak
  USB: iuu_phoenix: fix port-data memory leak
  USB: kl5kusb105: fix port-data memory leak
  USB: io_ti: fix port-data memory leak
  USB: keyspan_pda: fix port-data memory leak
  USB: f81232: fix port-data memory leak
  USB: io_edgeport: fix port-data memory leak
  USB: kobil_sct: fix port-data memory leak
  USB: cypress_m8: fix port-data memory leak
  usb: acm: fix the computation of the number of data bits
  usb: Missing dma_mask in ehci-vt8500.c when probed from device-tree
  usb: Missing dma_mask in uhci-platform.c when probed from device-tree
  ...
parents fb06de04 4b35f1c5

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7746,6 +7746,13 @@ W: http://www.ideasonboard.org/uvc/ 
S:	Maintained

F:	drivers/media/usb/uvc/



USB WEBCAM GADGET

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/gadget/*uvc*.c

F:	drivers/usb/gadget/webcam.c



USB WIRELESS RNDIS DRIVER (rndis_wlan)

M:	Jussi Kivilinna <jussi.kivilinna@mbnet.fi>

L:	linux-wireless@vger.kernel.org

drivers/usb/class/cdc-acm.c

+16 −6
Original line number Diff line number Diff line
@@ -817,10 +817,6 @@ static const __u32 acm_tty_speed[] = { 
	2500000, 3000000, 3500000, 4000000

};



static const __u8 acm_tty_size[] = {

	5, 6, 7, 8

};



static void acm_tty_set_termios(struct tty_struct *tty,

						struct ktermios *termios_old)

{
@@ -834,7 +830,21 @@ static void acm_tty_set_termios(struct tty_struct *tty, 
	newline.bParityType = termios->c_cflag & PARENB ?

				(termios->c_cflag & PARODD ? 1 : 2) +

				(termios->c_cflag & CMSPAR ? 2 : 0) : 0;

	newline.bDataBits = acm_tty_size[(termios->c_cflag & CSIZE) >> 4];

	switch (termios->c_cflag & CSIZE) {

	case CS5:

		newline.bDataBits = 5;

		break;

	case CS6:

		newline.bDataBits = 6;

		break;

	case CS7:

		newline.bDataBits = 7;

		break;

	case CS8:

	default:

		newline.bDataBits = 8;

		break;

	}

	/* FIXME: Needs to clear unsupported bits in the termios */

	acm->clocal = ((termios->c_cflag & CLOCAL) != 0);
@@ -1233,7 +1243,7 @@ made_compressed_probe: 


		if (usb_endpoint_xfer_int(epwrite))

			usb_fill_int_urb(snd->urb, usb_dev,

				usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress),

				usb_sndintpipe(usb_dev, epwrite->bEndpointAddress),

				NULL, acm->writesize, acm_write_bulk, snd, epwrite->bInterval);

		else

			usb_fill_bulk_urb(snd->urb, usb_dev,

drivers/usb/core/devio.c

+1 −0
Original line number Diff line number Diff line
@@ -1348,6 +1348,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb, 
					ret = -EFAULT;

					goto error;

				}

				uurb->buffer += u;

			}

			totlen -= u;

		}

drivers/usb/core/driver.c

+4 −0
Original line number Diff line number Diff line
@@ -367,6 +367,10 @@ static int usb_probe_interface(struct device *dev) 
	intf->condition = USB_INTERFACE_UNBOUND;

	usb_cancel_queued_reset(intf);



	/* If the LPM disable succeeded, balance the ref counts. */

	if (!lpm_disable_error)

		usb_unlocked_enable_lpm(udev);



	/* Unbound interfaces are always runtime-PM-disabled and -suspended */

	if (driver->supports_autosuspend)

		pm_runtime_disable(dev);

drivers/usb/core/hub.c

+23 −13
Original line number Diff line number Diff line
@@ -3241,8 +3241,7 @@ static int usb_req_set_sel(struct usb_device *udev, enum usb3_link_state state) 
			(state == USB3_LPM_U2 &&

			 (u2_sel > USB3_LPM_MAX_U2_SEL_PEL ||

			  u2_pel > USB3_LPM_MAX_U2_SEL_PEL))) {

		dev_dbg(&udev->dev, "Device-initiated %s disabled due "

				"to long SEL %llu ms or PEL %llu ms\n",

		dev_dbg(&udev->dev, "Device-initiated %s disabled due to long SEL %llu us or PEL %llu us\n",

				usb3_lpm_names[state], u1_sel, u1_pel);

		return -EINVAL;

	}
@@ -3319,16 +3318,6 @@ static int usb_set_device_initiated_lpm(struct usb_device *udev, 
	}



	if (enable) {

		/*

		 * First, let the device know about the exit latencies

		 * associated with the link state we're about to enable.

		 */

		ret = usb_req_set_sel(udev, state);

		if (ret < 0) {

			dev_warn(&udev->dev, "Set SEL for device-initiated "

					"%s failed.\n", usb3_lpm_names[state]);

			return -EBUSY;

		}

		/*

		 * Now send the control transfer to enable device-initiated LPM

		 * for either U1 or U2.
@@ -3414,7 +3403,28 @@ static int usb_set_lpm_timeout(struct usb_device *udev, 
static void usb_enable_link_state(struct usb_hcd *hcd, struct usb_device *udev,

		enum usb3_link_state state)

{

	int timeout;

	int timeout, ret;

	__u8 u1_mel = udev->bos->ss_cap->bU1devExitLat;

	__le16 u2_mel = udev->bos->ss_cap->bU2DevExitLat;



	/* If the device says it doesn't have *any* exit latency to come out of

	 * U1 or U2, it's probably lying.  Assume it doesn't implement that link

	 * state.

	 */

	if ((state == USB3_LPM_U1 && u1_mel == 0) ||

			(state == USB3_LPM_U2 && u2_mel == 0))

		return;



	/*

	 * First, let the device know about the exit latencies

	 * associated with the link state we're about to enable.

	 */

	ret = usb_req_set_sel(udev, state);

	if (ret < 0) {

		dev_warn(&udev->dev, "Set SEL for device-initiated %s failed.\n",

				usb3_lpm_names[state]);

		return;

	}



	/* We allow the host controller to set the U1/U2 timeout internally

	 * first, so that it can change its schedule to account for the