diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2012-01-31 09:04:15 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2012-01-31 09:06:14 +0100 |
| commit | a5044cddad2fba36c725a019a6cd0e3f286b13d0 (patch) | |
| tree | 04b679b6147437cc52f0cbfc08de999807e568a8 /drivers/dma | |
| parent | at_hdmac: bugfix for enabling channel irq (diff) | |
| parent | dmaengine: fix missing 'cnt' in ?: in dmatest (diff) | |
| download | linux-a5044cddad2fba36c725a019a6cd0e3f286b13d0.tar.xz linux-a5044cddad2fba36c725a019a6cd0e3f286b13d0.zip | |
Merge branch fixes of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/dmatest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 2b8661b54eaf..24225f0fdcd8 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c @@ -599,7 +599,7 @@ static int dmatest_add_channel(struct dma_chan *chan) } if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) { cnt = dmatest_add_threads(dtc, DMA_PQ); - thread_count += cnt > 0 ?: 0; + thread_count += cnt > 0 ? cnt : 0; } pr_info("dmatest: Started %u threads using %s\n", |