Commit 1ddb5527 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v3.17-rc2' of... 

Merge tag 'fixes-for-v3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into work-linus

Felipe writes:

usb: fixes for v3.17-rc2

Here's our first set of fixes for v3.17-rc cycle. Most fixes are
pretty minor changes like the signedness bug in dwc3, or the wrong
string format on MUSB.

The most interesting part is the addition of Intel Quark X1000 support
to PCH UDC.

Signed-of-by: default avatarFelipe Balbi <balbi@ti.com>
parents 6817ae22 5d197038

drivers/usb/dwc3/dwc3-omap.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static void dwc3_omap_set_utmi_mode(struct dwc3_omap *omap) 


static int dwc3_omap_extcon_register(struct dwc3_omap *omap)

{

	u32			ret;

	int			ret;

	struct device_node	*node = omap->dev->of_node;

	struct extcon_dev	*edev;

drivers/usb/gadget/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#

subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG)	:= -DDEBUG

subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE)	+= -DVERBOSE_DEBUG

ccflags-y				+= -I$(PWD)/drivers/usb/gadget/udc

ccflags-y				+= -Idrivers/usb/gadget/udc



obj-$(CONFIG_USB_LIBCOMPOSITE)	+= libcomposite.o

libcomposite-y			:= usbstring.o config.o epautoconf.o

drivers/usb/gadget/function/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# USB peripheral controller drivers

#



ccflags-y			:= -I$(PWD)/drivers/usb/gadget/

ccflags-y			+= -I$(PWD)/drivers/usb/gadget/udc/

ccflags-y			:= -Idrivers/usb/gadget/

ccflags-y			+= -Idrivers/usb/gadget/udc/



# USB Functions

usb_f_acm-y			:= f_acm.o

drivers/usb/gadget/function/u_ether.c

+0 −3
Original line number Diff line number Diff line
@@ -1127,10 +1127,7 @@ void gether_disconnect(struct gether *link) 


	DBG(dev, "%s\n", __func__);



	netif_tx_lock(dev->net);

	netif_stop_queue(dev->net);

	netif_tx_unlock(dev->net);



	netif_carrier_off(dev->net);



	/* disable endpoints, forcing (synchronous) completion

drivers/usb/gadget/function/uvc_video.c

+3 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req) 
		printk(KERN_INFO "Failed to queue request (%d).\n", ret);

		usb_ep_set_halt(ep);

		spin_unlock_irqrestore(&video->queue.irqlock, flags);

		uvc_queue_cancel(queue, 0);

		goto requeue;

	}

	spin_unlock_irqrestore(&video->queue.irqlock, flags);
@@ -281,6 +282,7 @@ error: 
static int

uvc_video_pump(struct uvc_video *video)

{

	struct uvc_video_queue *queue = &video->queue;

	struct usb_request *req;

	struct uvc_buffer *buf;

	unsigned long flags;
@@ -322,6 +324,7 @@ uvc_video_pump(struct uvc_video *video) 
			printk(KERN_INFO "Failed to queue request (%d)\n", ret);

			usb_ep_set_halt(video->ep);

			spin_unlock_irqrestore(&video->queue.irqlock, flags);

			uvc_queue_cancel(queue, 0);

			break;

		}

		spin_unlock_irqrestore(&video->queue.irqlock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE