Commit 47b514cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Pull USB fixes from Greg Kroah-Hartman:
 "Here are some small USB gadget bugfixes, and a few new USB device ids
  added to some drivers for the 3.5-rc5 release.

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

* tag 'usb-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: CP210x Add 10 Device IDs
  USB: option: Add USB ID for Novatel Ovation MC551
  usb: phy: Fix Kconfig dependency for Phy drivers
  usb-storage: revert commit afff07e6 (Add 090c:1000 to unusal-devs)
  SCSI & usb-storage: add try_rc_10_first flag
  usb: musb: host: release dma channels if no active io
  usb: gadget: lpc32xx_udc: fix build error with debugfs enabled
  usb: otg: twl6030-usb: Fix twl writes
  USB: option: add id for Cellient MEN-200
  usb: dwc3: fix giveback of queued request in ep_dequeue
  usb: gadget: Complete fsl qe/udc driver conversion
parents 2b256794 3fcc8f96

drivers/scsi/sd.c

+2 −0
Original line number Diff line number Diff line
@@ -1899,6 +1899,8 @@ static int sd_try_rc16_first(struct scsi_device *sdp) 
{

	if (sdp->host->max_cmd_len < 16)

		return 0;

	if (sdp->try_rc_10_first)

		return 0;

	if (sdp->scsi_level > SCSI_SPC_2)

		return 1;

	if (scsi_device_protection(sdp))

drivers/usb/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ obj-$(CONFIG_USB_MICROTEK) += image/ 
obj-$(CONFIG_USB_SERIAL)	+= serial/



obj-$(CONFIG_USB)		+= misc/

obj-$(CONFIG_USB)		+= phy/

obj-$(CONFIG_USB_COMMON)	+= phy/

obj-$(CONFIG_EARLY_PRINTK_DBGP)	+= early/



obj-$(CONFIG_USB_ATM)		+= atm/

drivers/usb/dwc3/gadget.c

+2 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, 
		if (r == req) {

			/* wait until it is processed */

			dwc3_stop_active_transfer(dwc, dep->number);

			goto out0;

			goto out1;

		}

		dev_err(dwc->dev, "request %p was not queued to %s\n",

				request, ep->name);
@@ -1099,6 +1099,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, 
		goto out0;

	}



out1:

	/* giveback the request */

	dwc3_gadget_giveback(dep, req, -ECONNRESET);

drivers/usb/gadget/fsl_qe_udc.h

+2 −2
Original line number Diff line number Diff line
@@ -153,10 +153,10 @@ struct usb_ep_para{ 
#define USB_BUSMODE_DTB		0x02



/* Endpoint basic handle */

#define ep_index(EP)		((EP)->desc->bEndpointAddress & 0xF)

#define ep_index(EP)		((EP)->ep.desc->bEndpointAddress & 0xF)

#define ep_maxpacket(EP)	((EP)->ep.maxpacket)

#define ep_is_in(EP)	((ep_index(EP) == 0) ? (EP->udc->ep0_dir == \

			USB_DIR_IN) : ((EP)->desc->bEndpointAddress \

			USB_DIR_IN) : ((EP)->ep.desc->bEndpointAddress \

			& USB_DIR_IN) == USB_DIR_IN)



/* ep0 transfer state */

drivers/usb/gadget/lpc32xx_udc.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <mach/irqs.h>

#include <mach/board.h>

#ifdef CONFIG_USB_GADGET_DEBUG_FILES

#include <linux/debugfs.h>

#include <linux/seq_file.h>

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE