summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@linux.intel.com>2012-01-31 13:34:15 +0530
committerVinod Koul <vinod.koul@linux.intel.com>2012-01-31 13:36:14 +0530
commita5044cddad2fba36c725a019a6cd0e3f286b13d0 (patch)
tree04b679b6147437cc52f0cbfc08de999807e568a8 /drivers
parentbda3a47c886664e86ee14eb79e9072b9e341f575 (diff)
parentd07a74a546981a09ba490936645fbf0d1340b96c (diff)
downloadlinux-a5044cddad2fba36c725a019a6cd0e3f286b13d0.tar.bz2
Merge branch fixes of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/dmatest.c2
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",