git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
[pandora-kernel.git]
/
drivers
/
dma
/
timb_dma.c
diff --git
a/drivers/dma/timb_dma.c
b/drivers/dma/timb_dma.c
index
2ec1ed5
..
3b88a4e
100644
(file)
--- 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;