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

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

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

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

 into usb-linus

Felipe writes:

usb: fixes for v3.12-rc4

Here are some more fixes to musb's OTG support and a regression
caused on latest merge window; pxa25x_udc and gpio-vbus learned
to cope with deferred probe; s3c-hsotg got a fix for non-periodic
endpoints write size and f_fs got an error handling fix for cases
where ffs_do_descs() fail.

Signed-of-by: default avatarFelipe Balbi <balbi@ti.com>
parents eb2addd4 b377216b

drivers/usb/gadget/f_fs.c

+2 −0
Original line number Diff line number Diff line
@@ -2256,6 +2256,8 @@ static int ffs_func_bind(struct usb_configuration *c, 
				   data->raw_descs + ret,

				   (sizeof data->raw_descs) - ret,

				   __ffs_func_bind_do_descs, func);

		if (unlikely(ret < 0))

			goto error;

	}



	/*

drivers/usb/gadget/pxa25x_udc.c

+5 −4
Original line number Diff line number Diff line
@@ -2054,7 +2054,7 @@ static struct pxa25x_udc memory = { 
/*

 *	probe - binds to the platform device

 */

static int __init pxa25x_udc_probe(struct platform_device *pdev)

static int pxa25x_udc_probe(struct platform_device *pdev)

{

	struct pxa25x_udc *dev = &memory;

	int retval, irq;
@@ -2203,7 +2203,7 @@ static void pxa25x_udc_shutdown(struct platform_device *_dev) 
	pullup_off();

}



static int __exit pxa25x_udc_remove(struct platform_device *pdev)

static int pxa25x_udc_remove(struct platform_device *pdev)

{

	struct pxa25x_udc *dev = platform_get_drvdata(pdev);
@@ -2294,7 +2294,8 @@ static int pxa25x_udc_resume(struct platform_device *dev) 


static struct platform_driver udc_driver = {

	.shutdown	= pxa25x_udc_shutdown,

	.remove		= __exit_p(pxa25x_udc_remove),

	.probe		= pxa25x_udc_probe,

	.remove		= pxa25x_udc_remove,

	.suspend	= pxa25x_udc_suspend,

	.resume		= pxa25x_udc_resume,

	.driver		= {
@@ -2303,7 +2304,7 @@ static struct platform_driver udc_driver = { 
	},

};



module_platform_driver_probe(udc_driver, pxa25x_udc_probe);

module_platform_driver(udc_driver);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");

drivers/usb/gadget/s3c-hsotg.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static int s3c_hsotg_write_fifo(struct s3c_hsotg *hsotg, 
	 * FIFO, requests of >512 cause the endpoint to get stuck with a

	 * fragment of the end of the transfer in it.

	 */

	if (can_write > 512)

	if (can_write > 512 && !periodic)

		can_write = 512;



	/*

drivers/usb/musb/musb_dsps.c

+3 −0
Original line number Diff line number Diff line
@@ -535,6 +535,9 @@ static int dsps_probe(struct platform_device *pdev) 
	struct dsps_glue *glue;

	int ret;



	if (!strcmp(pdev->name, "musb-hdrc"))

		return -ENODEV;



	match = of_match_node(musb_dsps_of_match, pdev->dev.of_node);

	if (!match) {

		dev_err(&pdev->dev, "fail to get matching of_match struct\n");

drivers/usb/musb/musb_gadget.c

+4 −1
Original line number Diff line number Diff line
@@ -1790,6 +1790,10 @@ int musb_gadget_setup(struct musb *musb) 
	musb->g.max_speed = USB_SPEED_HIGH;

	musb->g.speed = USB_SPEED_UNKNOWN;



	MUSB_DEV_MODE(musb);

	musb->xceiv->otg->default_a = 0;

	musb->xceiv->state = OTG_STATE_B_IDLE;



	/* this "gadget" abstracts/virtualizes the controller */

	musb->g.name = musb_driver_name;

	musb->g.is_otg = 1;
@@ -1849,7 +1853,6 @@ static int musb_gadget_start(struct usb_gadget *g, 
	musb->gadget_driver = driver;



	spin_lock_irqsave(&musb->lock, flags);

	musb->is_active = 1;



	otg_set_peripheral(otg, &musb->g);

	musb->xceiv->state = OTG_STATE_B_IDLE;