From: Tony Lindgren Date: Thu, 22 May 2008 00:42:23 +0000 (-0700) Subject: irda: Fix direct DMA register access for omap-ir X-Git-Tag: v2.6.26-omap1~123^2~67 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6375506353d0cda97bc73ba939762a4ed41a67d5;p=linux-2.6-omap-h63xx.git irda: Fix direct DMA register access for omap-ir Fix direct DMA register access for omap-ir. Signed-off-by: Tony Lindgren --- diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c index 1fc8c318179..7e2f74e9160 100644 --- a/drivers/net/irda/omap-ir.c +++ b/drivers/net/irda/omap-ir.c @@ -378,12 +378,8 @@ omap_irda_irq(int irq, void *dev_id) skb_reserve(skb, 1); - w = OMAP_DMA_CDAC_REG(omap_ir->rx_dma_channel); - - if (cpu_is_omap16xx()) - w -= OMAP1_DMA_CDSA_L_REG(omap_ir->rx_dma_channel); - if (cpu_is_omap24xx()) - w -= OMAP2_DMA_CDSA_REG(omap_ir->rx_dma_channel); + w = omap_get_dma_dst_pos(omap_ir->rx_dma_channel) - + omap_ir->rx_buf_dma_phys; if (!IS_FIR(omap_ir)) /* Copy DMA buffer to skb */