diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-08-25 18:13:09 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-09-01 12:59:17 +0300 |
| commit | 2436bdcda53ff4abb7897c87fa29ef3de8055344 (patch) | |
| tree | aa9204da61d1e888fea12ac09c948f5d77e793c5 /drivers/media/platform/soc_camera | |
| parent | b32dbc1e0bf0eaa8bdd725491b361d5fc2f57a85 (diff) | |
| download | linux-2436bdcda53ff4abb7897c87fa29ef3de8055344.tar.xz | |
dma-coherent: remove the DMA_MEMORY_MAP and DMA_MEMORY_IO flags
DMA_MEMORY_IO was never used in the tree, so remove it. That means there is
no need for the DMA_MEMORY_MAP flag either now, so remove it as well and
change dma_declare_coherent_memory to return a normal errno value.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'drivers/media/platform/soc_camera')
| -rw-r--r-- | drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c index 96dc01750bc0..36762ec954e7 100644 --- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c +++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c @@ -1708,11 +1708,10 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev) err = dma_declare_coherent_memory(&pdev->dev, res->start, res->start, resource_size(res), - DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE); - if (!err) { + if (err) { dev_err(&pdev->dev, "Unable to declare CEU memory.\n"); - return -ENXIO; + return err; } pcdev->video_limit = resource_size(res); |