Skip to content

Commit

Permalink
Merge tag 'dmaengine-fix-4.2-rc8' of git://git.infradead.org/users/vk…
Browse files Browse the repository at this point in the history
…oul/slave-dma

Pull dmaengine fix from Vinod Koul:
 "We recently found issue with dma_request_slave_channel() API causing
  privatecnt value to go bad.  This is fixed by balancing the privatecnt"

* tag 'dmaengine-fix-4.2-rc8' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: fix balance of privatecnt inc/dec operations
  • Loading branch information
torvalds committed Aug 18, 2015
2 parents f4566ed + 05aa1a7 commit 1b647a1
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/dma/dmaengine.c
Expand Up @@ -689,6 +689,10 @@ struct dma_chan *dma_request_slave_channel(struct device *dev,
struct dma_chan *ch = dma_request_slave_channel_reason(dev, name);
if (IS_ERR(ch))
return NULL;

dma_cap_set(DMA_PRIVATE, ch->device->cap_mask);
ch->device->privatecnt++;

return ch;
}
EXPORT_SYMBOL_GPL(dma_request_slave_channel);
Expand Down

0 comments on commit 1b647a1

Please sign in to comment.