summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-08 00:48:01 +0200
committerDan Williams <dan.j.williams@intel.com>2010-10-19 15:20:11 -0700
commit9cb047d4d19fc15791a64d900d483405eae6200d (patch)
tree6a3655d0c4ddfe76c8f0bbdebe070d40238d49dc
parent5fc6d897fde352bad5db5767e7260741a8cdd9e9 (diff)
downloadlinux-9cb047d4d19fc15791a64d900d483405eae6200d.tar.gz
linux-9cb047d4d19fc15791a64d900d483405eae6200d.tar.bz2
linux-9cb047d4d19fc15791a64d900d483405eae6200d.zip
dma/timberdale: simplify conditional
Simplify: ((a && b) || (!a && !b)) => (a == b) Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Acked-by: Jack Stone <jwjstone@fastmail.fm> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/dma/timb_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 2ec1ed56f204..3b88a4e7c98a 100644
--- a/drivers/dma/timb_dma.c
+++ b/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;