summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorEddie James <eajames@linux.ibm.com>2019-04-24 17:16:58 +0200
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-04-30 19:50:47 +0200
commit54b021099e2d20db324f2581cc0f18f9b22aadfa (patch)
treeb0182ad0cd4e5f56342da4aba9f52f5bac5265dd /drivers/media
parentmedia: platform: Aspeed: Remove use of reset line (diff)
downloadlinux-54b021099e2d20db324f2581cc0f18f9b22aadfa.tar.xz
linux-54b021099e2d20db324f2581cc0f18f9b22aadfa.zip
media: platform: Aspeed: Make reserved memory optional
Reserved memory doesn't need to be required; system memory would work fine. Signed-off-by: Eddie James <eajames@linux.ibm.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/aspeed-video.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index 55c55a68b016..8144fe36ad48 100644
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -1608,11 +1608,7 @@ static int aspeed_video_init(struct aspeed_video *video)
return PTR_ERR(video->vclk);
}
- rc = of_reserved_mem_device_init(dev);
- if (rc) {
- dev_err(dev, "Unable to reserve memory\n");
- return rc;
- }
+ of_reserved_mem_device_init(dev);
rc = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (rc) {