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

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

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

Felipe writes:
	usb: musb: patches for v3.9 merge window

	Mostly fixes all over which weren't urgent enough for
	the late -rc cycle.

	There is a Double Buffering fix for Host Mode TX,
	a dependency fix for the transceiver driver, some
	fixes to the error path and a fix for the use of
	omap_musb_maibox.

	Other than these fixes, there a removal duplicate
	headers from the dsps glue layer and removal of
	redundant assignments in omap2430_probe().
parents 6e247777 b37457d8

drivers/usb/musb/am35x.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int am35x_musb_init(struct musb *musb) 
	usb_nop_xceiv_register();

	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);

	if (IS_ERR_OR_NULL(musb->xceiv))

		return -ENODEV;

		return -EPROBE_DEFER;



	setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);

drivers/usb/musb/blackfin.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static int bfin_musb_init(struct musb *musb) 
	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);

	if (IS_ERR_OR_NULL(musb->xceiv)) {

		gpio_free(musb->config->gpio_vrsel);

		return -ENODEV;

		return -EPROBE_DEFER;

	}



	bfin_musb_reg_init(musb);

drivers/usb/musb/da8xx.c

+5 −2
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ static int da8xx_musb_init(struct musb *musb) 
{

	void __iomem *reg_base = musb->ctrl_base;

	u32 rev;

	int ret = -ENODEV;



	musb->mregs += DA8XX_MENTOR_CORE_OFFSET;
@@ -420,8 +421,10 @@ static int da8xx_musb_init(struct musb *musb) 


	usb_nop_xceiv_register();

	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);

	if (IS_ERR_OR_NULL(musb->xceiv))

	if (IS_ERR_OR_NULL(musb->xceiv)) {

		ret = -EPROBE_DEFER;

		goto fail;

	}



	setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);
@@ -441,7 +444,7 @@ static int da8xx_musb_init(struct musb *musb) 
	musb->isr = da8xx_musb_interrupt;

	return 0;

fail:

	return -ENODEV;

	return ret;

}



static int da8xx_musb_exit(struct musb *musb)

drivers/usb/musb/davinci.c

+5 −2
Original line number Diff line number Diff line
@@ -380,11 +380,14 @@ static int davinci_musb_init(struct musb *musb) 
{

	void __iomem	*tibase = musb->ctrl_base;

	u32		revision;

	int 		ret = -ENODEV;



	usb_nop_xceiv_register();

	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);

	if (IS_ERR_OR_NULL(musb->xceiv))

	if (IS_ERR_OR_NULL(musb->xceiv)) {

		ret = -EPROBE_DEFER;

		goto unregister;

	}



	musb->mregs += DAVINCI_BASE_OFFSET;
@@ -438,7 +441,7 @@ static int davinci_musb_init(struct musb *musb) 
	usb_put_phy(musb->xceiv);

unregister:

	usb_nop_xceiv_unregister();

	return -ENODEV;

	return ret;

}



static int davinci_musb_exit(struct musb *musb)

drivers/usb/musb/musb_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1993,6 +1993,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
	musb_platform_exit(musb);



fail1:

	pm_runtime_disable(musb->controller);

	dev_err(musb->controller,

		"musb_init_controller failed with status %d\n", status);