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: Dmitry Lifshitz <lifshitz@compulab.co.il>
Signed-off-by: Felipe Balbi <balbi@ti.com>

6 files changed, 96 insertions, 12 deletions

diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 5e63b160db0c..6ba8439bd5a6 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -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;
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index b903b744a224..0da6f648a9fe 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -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;
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index bea6cc35471c..f8aeaf2e2cd1 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -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;
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 628b93fe5ccc..b3e77613e0af 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -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;
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 7369ba33c94f..2c06a8969a9f 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -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;
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index 2c80004e0a83..028ff4d07dc7 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -189,6 +189,7 @@ static const struct musb_platform_ops ux500_ops = {
 
 static int ux500_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 ux500_glue               *glue;
@@ -232,8 +233,21 @@ static int ux500_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;