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

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

Merge tag 'fixes-for-v3.6-rc1' of... 

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

usb: fixes for v3.6-rc1

Here are three fixes for v3.6-rc1. All on the MUSB driver and
quite obvious. First there's a Kconfig change which was missed
earlier, then there is a fix for the usage of the resource name
and lastly a fix for pm_runtime usage and device initialization.

The last fix is rather critical as it can end up in situations
where we try to access device's register with clocks disabled,
which will cause a Data Abort exception (on ARM).
parents 0d7614f0 0e38c4ed

drivers/usb/musb/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 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_OMAPTI81XX || SOC_OMAPAM33XX)

	select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX)

	select TWL4030_USB if MACH_OMAP_3430SDP

	select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA

	select USB_OTG_UTILS
@@ -57,7 +57,7 @@ config USB_MUSB_AM35X 


config USB_MUSB_DSPS

	tristate "TI DSPS platforms"

	depends on SOC_OMAPTI81XX || SOC_OMAPAM33XX

	depends on SOC_TI81XX || SOC_AM33XX



config USB_MUSB_BLACKFIN

	tristate "Blackfin"

drivers/usb/musb/musb_dsps.c

+10 −9
Original line number Diff line number Diff line
@@ -479,9 +479,9 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id) 
		ret = -ENODEV;

		goto err0;

	}

	strcpy((u8 *)res->name, "mc");

	res->parent = NULL;

	resources[1] = *res;

	resources[1].name = "mc";



	/* allocate the child platform device */

	musb = platform_device_alloc("musb-hdrc", -1);
@@ -566,27 +566,28 @@ static int __devinit dsps_probe(struct platform_device *pdev) 
	}

	platform_set_drvdata(pdev, glue);



	/* create the child platform device for first instances of musb */

	ret = dsps_create_musb_pdev(glue, 0);

	if (ret != 0) {

		dev_err(&pdev->dev, "failed to create child pdev\n");

		goto err2;

	}



	/* enable the usbss clocks */

	pm_runtime_enable(&pdev->dev);



	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0) {

		dev_err(&pdev->dev, "pm_runtime_get_sync FAILED");

		goto err2;

	}



	/* create the child platform device for first instances of musb */

	ret = dsps_create_musb_pdev(glue, 0);

	if (ret != 0) {

		dev_err(&pdev->dev, "failed to create child pdev\n");

		goto err3;

	}



	return 0;



err3:

	pm_runtime_disable(&pdev->dev);

	pm_runtime_put(&pdev->dev);

err2:

	pm_runtime_disable(&pdev->dev);

	kfree(glue->wrp);

err1:

	kfree(glue);