projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
dma
/
omap-dma.c
diff --git
a/drivers/dma/omap-dma.c
b/drivers/dma/omap-dma.c
index bbea8243f9e806a0b0626da6c3336ef644a0dc25..c0016a68b44659d4965e69d73653c4860c1c49d2 100644
(file)
--- a/
drivers/dma/omap-dma.c
+++ b/
drivers/dma/omap-dma.c
@@
-1074,8
+1074,6
@@
static int omap_dma_chan_init(struct omap_dmadev *od, int dma_sig)
vchan_init(&c->vc, &od->ddev);
INIT_LIST_HEAD(&c->node);
- od->ddev.chancnt++;
-
return 0;
}
@@
-1233,7
+1231,6
@@
static struct platform_driver omap_dma_driver = {
.remove = omap_dma_remove,
.driver = {
.name = "omap-dma-engine",
- .owner = THIS_MODULE,
.of_match_table = of_match_ptr(omap_dma_match),
},
};