]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
dmaengine: at_hdmac: fix race while monitoring channel status
authorNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 12 Jan 2011 14:39:10 +0000 (15:39 +0100)
committerDan Williams <dan.j.williams@intel.com>
Sat, 15 Jan 2011 00:54:44 +0000 (16:54 -0800)
We were reading channel status then taking a lock. This lead to a race because
this lock may delay us and then make this channel not idle anymore.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/dma/at_hdmac.c

index 3938db210834d11302894a4cd9b28614ef029676..40f2bf4ae474eeaa74c55c7000612b8cfddfe46a 100644 (file)
@@ -853,11 +853,11 @@ static void atc_issue_pending(struct dma_chan *chan)
 
        dev_vdbg(chan2dev(chan), "issue_pending\n");
 
+       spin_lock_bh(&atchan->lock);
        if (!atc_chan_is_enabled(atchan)) {
-               spin_lock_bh(&atchan->lock);
                atc_advance_work(atchan);
-               spin_unlock_bh(&atchan->lock);
        }
+       spin_unlock_bh(&atchan->lock);
 }
 
 /**