From 5deb2516ae4499f3dcb9e933499cc91c9c506522 Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Fri, 8 Oct 2010 00:48:01 +0200
Subject: [PATCH] --- yaml --- r: 218811 b: refs/heads/master c:
 9cb047d4d19fc15791a64d900d483405eae6200d h: refs/heads/master i:   218809:
 2646ed2da6c7251a8abd8d2152be9659a1ae9afa   218807:
 cf906e1f3e40e9042644eb2aa549df4c28618351 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/dma/timb_dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2d4ed8c15ff3..e5012099d726 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fc6d897fde352bad5db5767e7260741a8cdd9e9
+refs/heads/master: 9cb047d4d19fc15791a64d900d483405eae6200d
diff --git a/trunk/drivers/dma/timb_dma.c b/trunk/drivers/dma/timb_dma.c
index 2ec1ed56f204..3b88a4e7c98a 100644
--- a/trunk/drivers/dma/timb_dma.c
+++ b/trunk/drivers/dma/timb_dma.c
@@ -759,7 +759,7 @@ static int __devinit td_probe(struct platform_device *pdev)
 			pdata->channels + i;
 
 		/* even channels are RX, odd are TX */
-		if (((i % 2) && pchan->rx) || (!(i % 2) && !pchan->rx)) {
+		if ((i % 2) == pchan->rx) {
 			dev_err(&pdev->dev, "Wrong channel configuration\n");
 			err = -EINVAL;
 			goto err_tasklet_kill;