Merge branch fixes of git://git.kernel.org/pub/scm/linux/kernel/git/d…

…jbw/dmaengine.git
mariux64 · Jan 31, 2012 · a5044cd · a5044cd
2 parents bda3a47 + d07a74a
commit a5044cd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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",