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

Commit e211bc8d 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: (30 commits)
  USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
  USB: Serial: Add device ID for Sierra Wireless MC8305
  USB: Serial: Added device ID for Qualcomm Modem in Sagemcom's HiLo3G
  usb/host/pci-quirks.c: correct annotation of `ehci_dmi_nohandoff_table'
  USB: option driver: add PID for Vodafone-Huawei K4511
  USB: option driver: add PID for Vodafone-Huawei K4510
  USB: option driver: add PID for Vodafone-Huawei K3771
  USB: option driver: add PID for Vodafone-Huawei K3770
  usb: serial: ftdi_sio.c: For the FT232H FTDI_SIO_SET_BAUDRATE_REQUEST, index needs to be shifted too
  usb/isp1760: Added missing call to usb_hcd_check_unlink_urb() during unlink
  USB: EHCI: Fix test mode sequence
  USB: ftdi_sio: fix minor typo in get_ftdi_divisor
  USB: at91_udc: include linux/prefetch.h explicitly
  USB: usb-storage: unusual_devs entry for ARM V2M motherboard.
  usb/ehci-mxc: add missing inclusion of mach/hardware.h
  USB: assign instead of equal in usbtmc.c
  usb: renesas_usbhs: fixup usbhsg_for_each_uep 1st pos
  usb: renesas_usbhs: fix DMA build by including dma-mapping.h
  usb: gadget: net2272 - Correct includes
  usb: musb: fix oops on musb_gadget_pullup
  ...
parents 8c70aac0 ce7e9065

drivers/usb/class/usbtmc.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ usbtmc_abort_bulk_in_status: 
				dev_err(dev, "usb_bulk_msg returned %d\n", rv);

				goto exit;

			}

		} while ((actual = max_size) &&

		} while ((actual == max_size) &&

			 (n < USBTMC_MAX_READS_TO_CLEAR_BULK_IN));



	if (actual == max_size) {

drivers/usb/core/config.c

+6 −5
Original line number Diff line number Diff line
@@ -123,10 +123,11 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, 
	}



	if (usb_endpoint_xfer_isoc(&ep->desc))

		max_tx = ep->desc.wMaxPacketSize * (desc->bMaxBurst + 1) *

			(desc->bmAttributes + 1);

		max_tx = (desc->bMaxBurst + 1) * (desc->bmAttributes + 1) *

			le16_to_cpu(ep->desc.wMaxPacketSize);

	else if (usb_endpoint_xfer_int(&ep->desc))

		max_tx = ep->desc.wMaxPacketSize * (desc->bMaxBurst + 1);

		max_tx = le16_to_cpu(ep->desc.wMaxPacketSize) *

			(desc->bMaxBurst + 1);

	else

		max_tx = 999999;

	if (le16_to_cpu(desc->wBytesPerInterval) > max_tx) {
@@ -134,10 +135,10 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, 
				"config %d interface %d altsetting %d ep %d: "

				"setting to %d\n",

				usb_endpoint_xfer_isoc(&ep->desc) ? "Isoc" : "Int",

				desc->wBytesPerInterval,

				le16_to_cpu(desc->wBytesPerInterval),

				cfgno, inum, asnum, ep->desc.bEndpointAddress,

				max_tx);

		ep->ss_ep_comp.wBytesPerInterval = max_tx;

		ep->ss_ep_comp.wBytesPerInterval = cpu_to_le16(max_tx);

	}

}

drivers/usb/gadget/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ config USB_PXA_U2O 
# musb builds in ../musb along with host support

config USB_GADGET_MUSB_HDRC

	tristate "Inventra HDRC USB Peripheral (TI, ADI, ...)"

	depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG)

	depends on USB_MUSB_HDRC

	select USB_GADGET_DUALSPEED

	help

	  This OTG-capable silicon IP is used in dual designs including

drivers/usb/gadget/at91_udc.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/list.h>

#include <linux/interrupt.h>

#include <linux/proc_fs.h>

#include <linux/prefetch.h>

#include <linux/clk.h>

#include <linux/usb/ch9.h>

#include <linux/usb/gadget.h>

drivers/usb/gadget/composite.c

+4 −2
Original line number Diff line number Diff line
@@ -1079,11 +1079,13 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
			cdev->desc.bMaxPacketSize0 =

				cdev->gadget->ep0->maxpacket;

			if (gadget_is_superspeed(gadget)) {

				if (gadget->speed >= USB_SPEED_SUPER)

				if (gadget->speed >= USB_SPEED_SUPER) {

					cdev->desc.bcdUSB = cpu_to_le16(0x0300);

				else

					cdev->desc.bMaxPacketSize0 = 9;

				} else {

					cdev->desc.bcdUSB = cpu_to_le16(0x0210);

				}

			}



			value = min(w_length, (u16) sizeof cdev->desc);

			memcpy(req->buf, &cdev->desc, value);