]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
irda: Fix direct DMA register access for omap-ir
authorTony Lindgren <tony@atomide.com>
Thu, 22 May 2008 00:42:23 +0000 (17:42 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 22 May 2008 00:51:46 +0000 (17:51 -0700)
Fix direct DMA register access for omap-ir.

Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/net/irda/omap-ir.c

index 1fc8c318179cadcb76628c933c94be653947fd7b..7e2f74e9160aafdd8a15bb7a15f93dc429fbbe43 100644 (file)
@@ -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 */