Merge branch fixes of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git

a5044cdd · Vinod Koul · bda3a47c · d07a74a5 · a5044cdd
Commit a5044cdd authored Jan 31, 2012 by Vinod Koul
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/dma/dmatest.c drivers/dma/dmatest.c +1 -1

No files found.
--- 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",