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

Commit 09fc7d22 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: musb: fix incorrect usage of resource pointer 



We can't simply pass the resource pointer from our
device down to our children, otherwise module
reinsertion will not work as the resource will
continue to be marked as busy.

Fix it by building a proper struct resource for
our child musb device.

Tested-by: default avatarDmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e4aa937e

drivers/usb/musb/blackfin.c

+16 −2
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ static u64 bfin_dmamask = DMA_BIT_MASK(32); 


static int bfin_probe(struct platform_device *pdev)

{

	struct resource musb_resources[2];

	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;

	struct platform_device		*musb;

	struct bfin_glue		*glue;
@@ -479,8 +480,21 @@ static int bfin_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, glue);



	ret = platform_device_add_resources(musb, pdev->resource,

			pdev->num_resources);

	memset(musb_resources, 0x00, sizeof(*musb_resources) *

			ARRAY_SIZE(musb_resources));



	musb_resources[0].name = pdev->resource[0].name;

	musb_resources[0].start = pdev->resource[0].start;

	musb_resources[0].end = pdev->resource[0].end;

	musb_resources[0].flags = pdev->resource[0].flags;



	musb_resources[1].name = pdev->resource[1].name;

	musb_resources[1].start = pdev->resource[1].start;

	musb_resources[1].end = pdev->resource[1].end;

	musb_resources[1].flags = pdev->resource[1].flags;



	ret = platform_device_add_resources(musb, musb_resources,

			ARRAY_SIZE(musb_resources));

	if (ret) {

		dev_err(&pdev->dev, "failed to add resources\n");

		goto err3;

drivers/usb/musb/da8xx.c

+16 −2
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ static u64 da8xx_dmamask = DMA_BIT_MASK(32); 


static int da8xx_probe(struct platform_device *pdev)

{

	struct resource musb_resources[2];

	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;

	struct platform_device		*musb;

	struct da8xx_glue		*glue;
@@ -521,8 +522,21 @@ static int da8xx_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, glue);



	ret = platform_device_add_resources(musb, pdev->resource,

			pdev->num_resources);

	memset(musb_resources, 0x00, sizeof(*musb_resources) *

			ARRAY_SIZE(musb_resources));



	musb_resources[0].name = pdev->resource[0].name;

	musb_resources[0].start = pdev->resource[0].start;

	musb_resources[0].end = pdev->resource[0].end;

	musb_resources[0].flags = pdev->resource[0].flags;



	musb_resources[1].name = pdev->resource[1].name;

	musb_resources[1].start = pdev->resource[1].start;

	musb_resources[1].end = pdev->resource[1].end;

	musb_resources[1].flags = pdev->resource[1].flags;



	ret = platform_device_add_resources(musb, musb_resources,

			ARRAY_SIZE(musb_resources));

	if (ret) {

		dev_err(&pdev->dev, "failed to add resources\n");

		goto err5;

drivers/usb/musb/davinci.c

+16 −2
Original line number Diff line number Diff line
@@ -509,6 +509,7 @@ static u64 davinci_dmamask = DMA_BIT_MASK(32); 


static int davinci_probe(struct platform_device *pdev)

{

	struct resource musb_resources[2];

	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;

	struct platform_device		*musb;

	struct davinci_glue		*glue;
@@ -553,8 +554,21 @@ static int davinci_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, glue);



	ret = platform_device_add_resources(musb, pdev->resource,

			pdev->num_resources);

	memset(musb_resources, 0x00, sizeof(*musb_resources) *

			ARRAY_SIZE(musb_resources));



	musb_resources[0].name = pdev->resource[0].name;

	musb_resources[0].start = pdev->resource[0].start;

	musb_resources[0].end = pdev->resource[0].end;

	musb_resources[0].flags = pdev->resource[0].flags;



	musb_resources[1].name = pdev->resource[1].name;

	musb_resources[1].start = pdev->resource[1].start;

	musb_resources[1].end = pdev->resource[1].end;

	musb_resources[1].flags = pdev->resource[1].flags;



	ret = platform_device_add_resources(musb, musb_resources,

			ARRAY_SIZE(musb_resources));

	if (ret) {

		dev_err(&pdev->dev, "failed to add resources\n");

		goto err5;

drivers/usb/musb/omap2430.c

+16 −2
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ static u64 omap2430_dmamask = DMA_BIT_MASK(32); 


static int omap2430_probe(struct platform_device *pdev)

{

	struct resource musb_resouces[2];

	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;

	struct omap_musb_board_data	*data;

	struct platform_device		*musb;
@@ -567,8 +568,21 @@ static int omap2430_probe(struct platform_device *pdev) 


	INIT_WORK(&glue->omap_musb_mailbox_work, omap_musb_mailbox_work);



	ret = platform_device_add_resources(musb, pdev->resource,

			pdev->num_resources);

	memset(musb_resouces, 0x00, sizeof(*musb_resources) *

			ARRAY_SIZE(musb_resources));



	musb_resources[0].name = pdev->resource[0].name;

	musb_resources[0].start = pdev->resource[0].start;

	musb_resources[0].end = pdev->resource[0].end;

	musb_resources[0].flags = pdev->resource[0].flags;



	musb_resources[1].name = pdev->resource[1].name;

	musb_resources[1].start = pdev->resource[1].start;

	musb_resources[1].end = pdev->resource[1].end;

	musb_resources[1].flags = pdev->resource[1].flags;



	ret = platform_device_add_resources(musb, musb_resources,

			ARRAY_SIZE(musb_resources));

	if (ret) {

		dev_err(&pdev->dev, "failed to add resources\n");

		goto err2;

drivers/usb/musb/tusb6010.c

+16 −2
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ static u64 tusb_dmamask = DMA_BIT_MASK(32); 


static int tusb_probe(struct platform_device *pdev)

{

	struct resource musb_resources[2];

	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;

	struct platform_device		*musb;

	struct tusb6010_glue		*glue;
@@ -1185,8 +1186,21 @@ static int tusb_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, glue);



	ret = platform_device_add_resources(musb, pdev->resource,

			pdev->num_resources);

	memset(musb_resources, 0x00, sizeof(*musb_resources) *

			ARRAY_SIZE(musb_resources));



	musb_resources[0].name = pdev->resource[0].name;

	musb_resources[0].start = pdev->resource[0].start;

	musb_resources[0].end = pdev->resource[0].end;

	musb_resources[0].flags = pdev->resource[0].flags;



	musb_resources[1].name = pdev->resource[1].name;

	musb_resources[1].start = pdev->resource[1].start;

	musb_resources[1].end = pdev->resource[1].end;

	musb_resources[1].flags = pdev->resource[1].flags;



	ret = platform_device_add_resources(musb, musb_resources,

			ARRAY_SIZE(musb_resources));

	if (ret) {

		dev_err(&pdev->dev, "failed to add resources\n");

		goto err3;