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

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

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

Felipe writes:

	usb: fixes for v3.9-rc4

	udc-core learned that it shouldn't use invalid pointers
	when unloading a gadget driver.

	net2272 and net2280 got a fix for a regression caused by
	the udc_start/udc_stop conversion.

	We're defining a static inline no-op for otg_ulpi_create()
	to prevent build errors when that driver isn't enabled.

	FunctionFS got a fix for an off-by-one error when binding
	and unbinding instances of FunctionFS.

	MUSB learned that it shouldn't try to unmap buffers which
	weren't previously mapped.

	f_rndis got a fix for a possible NULL pointer dereference
	in a debugging message code.

	MUSB's DA8xx glue layer got a build fix due to a typo.
parents d714aaf6 eda81bea

drivers/usb/gadget/f_rndis.c

+1 −2
Original line number Diff line number Diff line
@@ -447,14 +447,13 @@ static void rndis_response_complete(struct usb_ep *ep, struct usb_request *req) 
static void rndis_command_complete(struct usb_ep *ep, struct usb_request *req)

{

	struct f_rndis			*rndis = req->context;

	struct usb_composite_dev	*cdev = rndis->port.func.config->cdev;

	int				status;



	/* received RNDIS command from USB_CDC_SEND_ENCAPSULATED_COMMAND */

//	spin_lock(&dev->lock);

	status = rndis_msg_parser(rndis->config, (u8 *) req->buf);

	if (status < 0)

		ERROR(cdev, "RNDIS command error %d, %d/%d\n",

		pr_err("RNDIS command error %d, %d/%d\n",

			status, req->actual, req->length);

//	spin_unlock(&dev->lock);

}

drivers/usb/gadget/g_ffs.c

+2 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static int gfs_bind(struct usb_composite_dev *cdev) 
		goto error;

	gfs_dev_desc.iProduct = gfs_strings[USB_GADGET_PRODUCT_IDX].id;



	for (i = func_num; --i; ) {

	for (i = func_num; i--; ) {

		ret = functionfs_bind(ffs_tab[i].ffs_data, cdev);

		if (unlikely(ret < 0)) {

			while (++i < func_num)
@@ -413,7 +413,7 @@ static int gfs_unbind(struct usb_composite_dev *cdev) 
		gether_cleanup();

	gfs_ether_setup = false;



	for (i = func_num; --i; )

	for (i = func_num; i--; )

		if (ffs_tab[i].ffs_data)

			functionfs_unbind(ffs_tab[i].ffs_data);

drivers/usb/gadget/net2272.c

+8 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const char * const ep_name[] = { 
};



#define DMA_ADDR_INVALID	(~(dma_addr_t)0)

#ifdef CONFIG_USB_GADGET_NET2272_DMA

#ifdef CONFIG_USB_NET2272_DMA

/*

 * use_dma: the NET2272 can use an external DMA controller.

 * Note that since there is no generic DMA api, some functions,
@@ -1495,6 +1495,13 @@ stop_activity(struct net2272 *dev, struct usb_gadget_driver *driver) 
	for (i = 0; i < 4; ++i)

		net2272_dequeue_all(&dev->ep[i]);



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

	if (driver) {

		spin_unlock(&dev->lock);

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

		spin_lock(&dev->lock);

	}



	net2272_usb_reinit(dev);

}

drivers/usb/gadget/net2280.c

+7 −1
Original line number Diff line number Diff line
@@ -1924,7 +1924,6 @@ static int net2280_start(struct usb_gadget *_gadget, 
err_func:

	device_remove_file (&dev->pdev->dev, &dev_attr_function);

err_unbind:

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

	dev->gadget.dev.driver = NULL;

	dev->driver = NULL;

	return retval;
@@ -1946,6 +1945,13 @@ stop_activity (struct net2280 *dev, struct usb_gadget_driver *driver) 
	for (i = 0; i < 7; i++)

		nuke (&dev->ep [i]);



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

	if (driver) {

		spin_unlock(&dev->lock);

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

		spin_lock(&dev->lock);

	}



	usb_reinit (dev);

}

drivers/usb/gadget/u_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static struct portmaster { 
	pr_debug(fmt, ##arg)

#endif /* pr_vdebug */

#else

#ifndef pr_vdebig

#ifndef pr_vdebug

#define pr_vdebug(fmt, arg...) \

	({ if (0) pr_debug(fmt, ##arg); })

#endif /* pr_vdebug */