diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-31 19:47:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-31 19:47:03 +0200 |
| commit | 0050ae57cd02dbd4f171622d0269e2fb7029a23e (patch) | |
| tree | f2e98a37c20c3f8389e5cf3349d1d674e4197bfa /drivers/dma/dmaengine.c | |
| parent | a57e456a7b28431b55e407e5ab78ebd5b378d19e (diff) | |
| parent | 488ca7d72d974e3c00ae73ed9f947590680bdf00 (diff) | |
Merge branch 'x86/cpufeature' into x86/urgent, because it's ready
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/dma/dmaengine.c')
| -rw-r--r-- | drivers/dma/dmaengine.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 4a4cce15f25d..3ff284c8e3d5 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -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); |