Merge branch 'omap-fixes'

diff --combined arch/arm/plat-omap/dma.c
index 3fd0e77bb9f8409d2ab9cfc701e9abd1d8d8ee5c,559cbb5374408d20218362d3db76e2396e2fe664..609301860c50c6544d9cf795b4e069dbb785e428
mode 100755,100644..100755
--- 1/arch/arm/plat-omap/dma.c
--- 2/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@@ -738,7 -738,7 +738,7 @@@ int omap_request_dma(int dev_id, const 
                 * id.
                 */
                dma_write(dev_id | (1 << 10), CCR(free_ch));
 -      } else if (cpu_is_omap7xx() || cpu_is_omap15xx()) {
 +      } else if (cpu_is_omap730() || cpu_is_omap15xx()) {
                dma_write(dev_id, CCR(free_ch));
        }
  
@@@ -760,19 -760,12 +760,12 @@@ void omap_free_dma(int lch
  {
        unsigned long flags;
  
-       spin_lock_irqsave(&dma_chan_lock, flags);
        if (dma_chan[lch].dev_id == -1) {
                pr_err("omap_dma: trying to free unallocated DMA channel %d\n",
                       lch);
-               spin_unlock_irqrestore(&dma_chan_lock, flags);
                return;
        }
  
-       dma_chan[lch].dev_id = -1;
-       dma_chan[lch].next_lch = -1;
-       dma_chan[lch].callback = NULL;
-       spin_unlock_irqrestore(&dma_chan_lock, flags);
- 
        if (cpu_class_is_omap1()) {
                /* Disable all DMA interrupts for the channel. */
                dma_write(0, CICR(lch));
@@@ -798,6 -791,12 +791,12 @@@
                dma_write(0, CCR(lch));
                omap_clear_dma(lch);
        }
+ 
+       spin_lock_irqsave(&dma_chan_lock, flags);
+       dma_chan[lch].dev_id = -1;
+       dma_chan[lch].next_lch = -1;
+       dma_chan[lch].callback = NULL;
+       spin_unlock_irqrestore(&dma_chan_lock, flags);
  }
  EXPORT_SYMBOL(omap_free_dma);
  
@@@ -2346,7 -2345,7 +2345,7 @@@ static int __init omap_init_dma(void
                printk(KERN_INFO "DMA support for OMAP15xx initialized\n");
                dma_chan_count = 9;
                enable_1510_mode = 1;
 -      } else if (cpu_is_omap16xx() || cpu_is_omap7xx()) {
 +      } else if (cpu_is_omap16xx() || cpu_is_omap730()) {
                printk(KERN_INFO "OMAP DMA hardware version %d\n",
                       dma_read(HW_ID));
                printk(KERN_INFO "DMA capabilities: %08x:%08x:%04x:%04x:%04x\n",