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

This commit is contained in:
Vinod Koul 2012-01-31 13:34:15 +05:30
commit a5044cddad

View File

@ -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",