dmaengine: rcar-dmac: Fix spinlock issues in interrupt
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tue, 27 Jan 2015 13:52:13 +0000 (15:52 +0200)
committerVinod Koul <vinod.koul@intel.com>
Mon, 16 Feb 2015 04:03:32 +0000 (09:33 +0530)
The rcar_dmac_desc_put() function is called in interrupt context and
must thus use spin_lock_irqsave() instead of spin_lock_irq().

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/sh/rcar-dmac.c

index 8367578bac638dd1ada2ccb40dba9444ca5cce6d..5a6b85527107c85a069ec072c61c51854428f8c3 100644 (file)
@@ -487,16 +487,16 @@ static int rcar_dmac_desc_alloc(struct rcar_dmac_chan *chan, gfp_t gfp)
  *
  * The descriptor must have been removed from the channel's lists before calling
  * this function.
- *
- * Locking: Must be called in non-atomic context.
  */
 static void rcar_dmac_desc_put(struct rcar_dmac_chan *chan,
                               struct rcar_dmac_desc *desc)
 {
-       spin_lock_irq(&chan->lock);
+       unsigned long flags;
+
+       spin_lock_irqsave(&chan->lock, flags);
        list_splice_tail_init(&desc->chunks, &chan->desc.chunks_free);
        list_add_tail(&desc->node, &chan->desc.free);
-       spin_unlock_irq(&chan->lock);
+       spin_unlock_irqrestore(&chan->lock, flags);
 }
 
 static void rcar_dmac_desc_recycle_acked(struct rcar_dmac_chan *chan)