diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 08:10:44 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 08:10:44 -0800 |
commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/dma/mmp_pdma.c | |
parent | 8e2f2325b73f3e5e46ecffd291556f33b8e3f8c9 (diff) | |
parent | 497ab1f290a26fa9414c5c316515f1e2ddba0803 (diff) | |
download | op-kernel-dev-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.zip op-kernel-dev-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.gz |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'drivers/dma/mmp_pdma.c')
-rw-r--r-- | drivers/dma/mmp_pdma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c index dcb1e05..8869500 100644 --- a/drivers/dma/mmp_pdma.c +++ b/drivers/dma/mmp_pdma.c @@ -1017,6 +1017,7 @@ static int mmp_pdma_probe(struct platform_device *op) } } + platform_set_drvdata(op, pdev); dev_info(pdev->device.dev, "initialized %d channels\n", dma_channels); return 0; } |