[PATCH 1/1] ARM: OMAP: Fix musb_core parameter passing to cppi start

[PATCH 1/1] ARM: OMAP: Fix musb_core parameter passing to cppi start

[Dirk Behme]

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]


cppi_controller_start() expects a struct dma_controller as parameter
and not dma_controller private_data. Current implementation crashes
with e.g.

Internal error: Oops: 805 [#1]
Modules linked in:
CPU: 0    Not tainted  (2.6.23-rc4-davinci1 #2)
PC is at cppi_controller_start+0x18/0x140
LR is at musb_probe+0x1f4/0x824

Fix this. Initial proposal for fix by David Brownell. Thanks!

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>


[-- Attachment #2: musb_core_oops_fix.txt --]
[-- Type: text/plain, Size: 490 bytes --]

Index: linux-osk/drivers/usb/musb/musb_core.c
===================================================================
--- linux-osk.orig/drivers/usb/musb/musb_core.c
+++ linux-osk/drivers/usb/musb/musb_core.c
@@ -1980,7 +1980,7 @@ musb_init_controller(struct device *dev,
 		c = dma_controller_create(musb, musb->mregs);
 		musb->dma_controller = c;
 		if (c)
-			(void) c->start(c->private_data);
+			(void) c->start(c);
 	}
 #endif
 	/* ideally this would be abstracted in platform setup */


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/1] ARM: OMAP: Fix musb_core parameter passing to cppi start

[Tony Lindgren]

* Dirk Behme <dirk.behme@googlemail.com> [071008 11:36]:
>
> cppi_controller_start() expects a struct dma_controller as parameter
> and not dma_controller private_data. Current implementation crashes
> with e.g.
>
> Internal error: Oops: 805 [#1]
> Modules linked in:
> CPU: 0    Not tainted  (2.6.23-rc4-davinci1 #2)
> PC is at cppi_controller_start+0x18/0x140
> LR is at musb_probe+0x1f4/0x824
>
> Fix this. Initial proposal for fix by David Brownell. Thanks!
>
> Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
>

> Index: linux-osk/drivers/usb/musb/musb_core.c
> ===================================================================
> --- linux-osk.orig/drivers/usb/musb/musb_core.c
> +++ linux-osk/drivers/usb/musb/musb_core.c
> @@ -1980,7 +1980,7 @@ musb_init_controller(struct device *dev,
>  		c = dma_controller_create(musb, musb->mregs);
>  		musb->dma_controller = c;
>  		if (c)
> -			(void) c->start(c->private_data);
> +			(void) c->start(c);
>  	}
>  #endif
>  	/* ideally this would be abstracted in platform setup */
> 

Pushing today.

Tony