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

Commit ea78201e authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Felipe Balbi
Browse files

usb: musb: davinci: fix resources passed to MUSB driver for DM6467 



After commit 09fc7d22 (usb: musb: fix incorrect
usage of  resource pointer), CPPI DMA driver on DaVinci DM6467 can't detect its
dedicated IRQ and so the MUSB IRQ  is erroneously used instead. This is because
only 2 resources are passed to the MUSB driver from the DaVinci glue layer,  so
fix  this by always copying 3 resources (it's  safe since a placeholder for the
3rd resource is always  there) and passing 'pdev->num_resources' instead of the
size of musb_resources[] to platform_device_add_resources().

Cc: <stable@vger.kernel.org> # 3.11+
Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 77a3a0aa

drivers/usb/musb/davinci.c

+10 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ static const struct platform_device_info davinci_dev_info = { 


static int davinci_probe(struct platform_device *pdev)

{

	struct resource musb_resources[2];

	struct resource			musb_resources[3];

	struct musb_hdrc_platform_data	*pdata = dev_get_platdata(&pdev->dev);

	struct platform_device		*musb;

	struct davinci_glue		*glue;
@@ -561,6 +561,15 @@ static int davinci_probe(struct platform_device *pdev) 
	musb_resources[1].end = pdev->resource[1].end;

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



	/*

	 * For DM6467 3 resources are passed. A placeholder for the 3rd

	 * resource is always there, so it's safe to always copy it...

	 */

	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;



	pinfo = davinci_dev_info;

	pinfo.parent = &pdev->dev;

	pinfo.res = musb_resources;