| commit | a5044cddad2fba36c725a019a6cd0e3f286b13d0 | [log] [tgz] |
|---|---|---|
| author | Vinod Koul <vinod.koul@linux.intel.com> | Tue Jan 31 13:34:15 2012 +0530 |
| committer | Vinod Koul <vinod.koul@linux.intel.com> | Tue Jan 31 13:36:14 2012 +0530 |
| tree | 04b679b6147437cc52f0cbfc08de999807e568a8 | |
| parent | bda3a47c886664e86ee14eb79e9072b9e341f575 [diff] | |
| parent | d07a74a546981a09ba490936645fbf0d1340b96c [diff] |
Merge branch fixes of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 2b8661b..24225f0 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c
@@ -599,7 +599,7 @@ } 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",