diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-18 06:26:24 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-18 06:26:24 +1200 |
| commit | 298e320431db1db52b9ddd6f242bb33a4ea2d094 (patch) | |
| tree | ef1ce12b65b2989958559c6a51dbde9b9cff08dd | |
| parent | 59b2858f57bbd42f36aa177d21ab011a87da3de2 (diff) | |
| parent | 6acf3998d2c7420b2deb2b475fa78ba7573c6162 (diff) | |
| download | op-kernel-dev-298e320431db1db52b9ddd6f242bb33a4ea2d094.zip op-kernel-dev-298e320431db1db52b9ddd6f242bb33a4ea2d094.tar.gz | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Two patches, the first by Andy to fix dw dmac runtime pm and second
one by me to fix the dmaengine headers in MAINTAINERS"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: dw: balance PM runtime calls
MAINTAINERS: dmaengine: fix the header file for dmaengine
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/dma/dw/core.c | 2 | ||||
| -rw-r--r-- | drivers/dma/dw/platform.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ab6610e..5e61aef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3183,7 +3183,7 @@ L: dmaengine@vger.kernel.org Q: https://patchwork.kernel.org/project/linux-dmaengine/list/ S: Maintained F: drivers/dma/ -F: include/linux/dma* +F: include/linux/dmaengine.h F: Documentation/dmaengine/ T: git git://git.infradead.org/users/vkoul/slave-dma.git diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index 3804785..5c06254 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c @@ -1505,7 +1505,6 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata) dw->regs = chip->regs; chip->dw = dw; - pm_runtime_enable(chip->dev); pm_runtime_get_sync(chip->dev); dw_params = dma_read_byaddr(chip->regs, DW_PARAMS); @@ -1703,7 +1702,6 @@ int dw_dma_remove(struct dw_dma_chip *chip) } pm_runtime_put_sync_suspend(chip->dev); - pm_runtime_disable(chip->dev); return 0; } EXPORT_SYMBOL_GPL(dw_dma_remove); diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c index a630161..32ea1ac 100644 --- a/drivers/dma/dw/platform.c +++ b/drivers/dma/dw/platform.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/device.h> #include <linux/clk.h> +#include <linux/pm_runtime.h> #include <linux/platform_device.h> #include <linux/dmaengine.h> #include <linux/dma-mapping.h> @@ -185,6 +186,8 @@ static int dw_probe(struct platform_device *pdev) if (err) return err; + pm_runtime_enable(&pdev->dev); + err = dw_dma_probe(chip, pdata); if (err) goto err_dw_dma_probe; @@ -205,6 +208,7 @@ static int dw_probe(struct platform_device *pdev) return 0; err_dw_dma_probe: + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(chip->clk); return err; } @@ -217,6 +221,7 @@ static int dw_remove(struct platform_device *pdev) of_dma_controller_free(pdev->dev.of_node); dw_dma_remove(chip); + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(chip->clk); return 0; |
