From: Eddie James <eajames@linux.ibm.com>
Date: Wed, 24 Apr 2019 15:16:58 +0000 (-0400)
Subject: media: platform: Aspeed: Make reserved memory optional
X-Git-Tag: v5.2-rc1~33^2~17
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=54b021099e2d20db324f2581cc0f18f9b22aadfa;p=tomoyo%2Ftomoyo-test1.git

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>
---

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) {