From: Dirk Behme <dirk.behme@googlemail.com>
Date: Mon, 8 Oct 2007 18:35:14 +0000 (+0200)
Subject: ARM: OMAP: Fix musb_core parameter passing to cppi start
X-Git-Tag: v2.6.23-omap1~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2110060d27c064172bb9d98a402e2b25957af744;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix musb_core parameter passing to cppi start

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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 9a73de521a8..3093bda5426 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1980,7 +1980,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 		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 */