[PATCH 2.6.32 61/62] dmaengine: fix missing cnt in ?: in dmatest

2.6.32-longterm review patch.  If anyone has any objections, please let me know.

------------------

From: "Dr. David Alan Gilbert" <redacted>

Hi,
  On the latest tree my compiler has started giving the warning:

drivers/dma/dmatest.c:575:28: warning: the omitted middle operand in ?: will always be ?true?, suggest explicit middle operand [-Wparentheses]

The following patch fixes the missing middle clause with the same
fix that Nicolas Ferre used in the similar clauses.
(There seems to have been a race between him fixing that and
the extra clause going in a little later).

I don't actually know the dmatest code/structures, nor do I own
any hardware to test it on (assuming it needs a DMA engine);
 but this patch builds, the existing code is almost certainly
wrong and the fix is the same as the corresponding lines above it.

(WTH is x=y?:z legal C anyway?)

Signed-off-by: Dr. David Alan Gilbert <redacted>
Reported-by: Dan Carpenter <redacted>
Reported-by: Paul Gortmaker <redacted>
Acked-by: Nicolas Ferre <redacted>
Signed-off-by: Dan Williams <redacted>
(cherry picked from commit d07a74a546981a09ba490936645fbf0d1340b96c)

Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 drivers/dma/dmatest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index a32a4cf..d7c282a 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c

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

-- 
1.7.12.2.21.g234cd45.dirty