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

Commit c1f01be4 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Felipe Balbi
Browse files

usb: musb: fix resource passed from glue layer to musb 



some MUSB incarnations, such as those governed by
omap2430.c and tusb6010.c, have three resources, not
two.

Fix the bug created by commit 09fc7d22 (usb: musb:
fix incorrect usage of resource pointer) where only
two of the three resources would be passed to musb_core.c

[ balbi@ti.com : add tusb6010.c to original patch ]

Tested-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 690c70ba

drivers/usb/musb/omap2430.c

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


static int omap2430_probe(struct platform_device *pdev)

{

	struct resource			musb_resources[2];

	struct resource			musb_resources[3];

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

	struct omap_musb_board_data	*data;

	struct platform_device		*musb;
@@ -581,6 +581,11 @@ static int omap2430_probe(struct platform_device *pdev) 
	musb_resources[1].end = pdev->resource[1].end;

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



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

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

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

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



	ret = platform_device_add_resources(musb, musb_resources,

			ARRAY_SIZE(musb_resources));

	if (ret) {

drivers/usb/musb/tusb6010.c

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


static int tusb_probe(struct platform_device *pdev)

{

	struct resource musb_resources[2];

	struct resource musb_resources[3];

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

	struct platform_device		*musb;

	struct tusb6010_glue		*glue;
@@ -1199,6 +1199,11 @@ static int tusb_probe(struct platform_device *pdev) 
	musb_resources[1].end = pdev->resource[1].end;

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



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

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

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

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



	ret = platform_device_add_resources(musb, musb_resources,

			ARRAY_SIZE(musb_resources));

	if (ret) {