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;