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

Commit 4fa42e89 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v3.9-rc3' of... 

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

 into usb-linus

Felipe writes:

  usb: fixes for v3.9-rc3

  Most fixes are on 'musb' driver. There's a sparse warning
  fix which marks omap2430_glue as static, a build warning
  fix which was found with randconfig, a fix for omap_musb_mailbox
  check and removal of 'select' from musb's Kconfig to prevent
  Kconfig warnings.

  Other than that, pxa25x got a fix which was introduced by the
  latest conversion to udc_start/udc_stop patchset, kernel-doc
  warnings for composite layer  and dwc3 got a build fix on
  sparc64.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents b44983bb 66e4afc7

drivers/usb/dwc3/ep0.c

+4 −3
Original line number Diff line number Diff line
@@ -892,6 +892,7 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, 
	} else if (!IS_ALIGNED(req->request.length, dep->endpoint.maxpacket)

			&& (dep->number == 0)) {

		u32	transfer_size;

		u32	maxpacket;



		ret = usb_gadget_map_request(&dwc->gadget, &req->request,

				dep->number);
@@ -902,8 +903,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, 


		WARN_ON(req->request.length > DWC3_EP0_BOUNCE_SIZE);



		transfer_size = roundup(req->request.length,

				(u32) dep->endpoint.maxpacket);

		maxpacket = dep->endpoint.maxpacket;

		transfer_size = roundup(req->request.length, maxpacket);



		dwc->ep0_bounced = true;

drivers/usb/gadget/composite.c

+1 −4
Original line number Diff line number Diff line
@@ -1757,10 +1757,7 @@ static const struct usb_gadget_driver composite_driver_template = { 
/**

 * usb_composite_probe() - register a composite driver

 * @driver: the driver to register

 * @bind: the callback used to allocate resources that are shared across the

 *	whole device, such as string IDs, and add its configurations using

 *	@usb_add_config().  This may fail by returning a negative errno

 *	value; it should return zero on successful initialization.

 *

 * Context: single threaded during gadget setup

 *

 * This function is used to register drivers using the composite driver

drivers/usb/gadget/pxa25x_udc.c

+4 −0
Original line number Diff line number Diff line
@@ -1303,6 +1303,10 @@ stop_activity(struct pxa25x_udc *dev, struct usb_gadget_driver *driver) 
	}

	del_timer_sync(&dev->timer);



	/* report disconnect; the driver is already quiesced */

	if (driver)

		driver->disconnect(&dev->gadget);



	/* re-init driver-visible data structures */

	udc_reinit(dev);

}

drivers/usb/musb/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ 
config USB_MUSB_HDRC

	tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'

	depends on USB && USB_GADGET

	select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)

	select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX)

	select OMAP_CONTROL_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA

	select USB_OTG_UTILS

	help

	  Say Y here if your system has a dual role high speed USB
@@ -49,8 +46,6 @@ config USB_MUSB_TUSB6010 
config USB_MUSB_OMAP2PLUS

	tristate "OMAP2430 and onwards"

	depends on ARCH_OMAP2PLUS

	select TWL4030_USB if MACH_OMAP_3430SDP

	select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA



config USB_MUSB_AM35X

	tristate "AM35x"

drivers/usb/musb/musb_core.c

+0 −2
Original line number Diff line number Diff line
@@ -1968,11 +1968,9 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
	if (status < 0)

		goto fail4;



#ifdef CONFIG_SYSFS

	status = sysfs_create_group(&musb->controller->kobj, &musb_attr_group);

	if (status)

		goto fail5;

#endif



	pm_runtime_put(musb->controller);