Merge branch 'topic/mv' into for-linus

ca36ed0c · Vinod Koul · 81c3ee02 · cbc229a4 · ca36ed0c
Commit ca36ed0c authored Oct 24, 2018 by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/dma/mv_xor.c drivers/dma/mv_xor.c +2 -2

No files found.
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -348,9 +348,9 @@ static void mv_xor_tasklet(unsigned long data)
 {
 	struct mv_xor_chan *chan = (struct mv_xor_chan *) data;
-	spin_lock_bh(&chan->lock);
+	spin_lock(&chan->lock);
 	mv_chan_slot_cleanup(chan);
-	spin_unlock_bh(&chan->lock);
+	spin_unlock(&chan->lock);
 }
 static struct mv_xor_desc_slot *