From: Tony Lindgren Date: Fri, 1 Sep 2006 08:40:46 +0000 (+0300) Subject: MUSB: Fix TUSB DMA register access X-Git-Tag: v2.6.18-omap1~88^2~18 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b6c43e7b9401c7112be3169248fbf898a149c1fa;p=linux-2.6-omap-h63xx.git MUSB: Fix TUSB DMA register access It got broken by musb-m1 snapshot. Signed-off-by: Tony Lindgren --- diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index 7515d072507..3a1f4b91cd0 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c @@ -143,7 +143,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data) struct tusb_omap_dma *tusb_dma = chdat->tusb_dma; struct musb *musb = chdat->musb; struct musb_hw_ep *hw_ep = chdat->hw_ep; - void __iomem *ep_conf = hw_ep->regs; + void __iomem *ep_conf = hw_ep->conf; void __iomem *musb_base = musb->pRegs; unsigned long transferred, flags; int ch; @@ -211,7 +211,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, struct musb *musb = chdat->musb; struct musb_hw_ep *hw_ep = chdat->hw_ep; void __iomem *musb_base = musb->pRegs; - void __iomem *ep_conf = hw_ep->regs; + void __iomem *ep_conf = hw_ep->conf; dma_addr_t fifo = hw_ep->fifo_sync; struct omap_dma_channel_params dma_params; int src_burst, dst_burst;