diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-10-24 09:16:08 +0100 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-10-24 09:16:08 +0100 |
| commit | ca36ed0c4547e954f8cac9dfc5a647fb4dbd243c (patch) | |
| tree | d83015ae8ce1ccbcbb0dc38a4fc633c24815d811 /drivers/dma | |
| parent | 81c3ee027e5d79eb184d2b225a67b06e9e5b9271 (diff) | |
| parent | cbc229a47c82052677cac3066db7cb90aa8ffdc2 (diff) | |
| download | blackbird-obmc-linux-ca36ed0c4547e954f8cac9dfc5a647fb4dbd243c.tar.gz blackbird-obmc-linux-ca36ed0c4547e954f8cac9dfc5a647fb4dbd243c.zip | |
Merge branch 'topic/mv' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/mv_xor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 969534c1a6c6..7f595355fb79 100644 --- 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 * |
