summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJae Hyun Yoo <jae.hyun.yoo@linux.intel.com>2019-08-23 18:29:57 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-08-26 10:46:29 -0300
commit578c5ab074981b1e74331e58df4b8ef4439df563 (patch)
treed3551d3ab232f5381b0890dc50b482f5f420efa3
parent834a1cfee8340775798296eb693964c883e239a2 (diff)
downloadlinux-0-day-578c5ab074981b1e74331e58df4b8ef4439df563.tar.gz
linux-0-day-578c5ab074981b1e74331e58df4b8ef4439df563.tar.xz
media: aspeed: fix an incorrect return code on buffer allocation failure
It returns '0' even when a failure happens on jpeg buffer allocation so this commit fixes the issue. Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--drivers/media/platform/aspeed-video.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index f899ac3b4a613..94f97d96dabc8 100644
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -1624,6 +1624,7 @@ static int aspeed_video_init(struct aspeed_video *video)
if (!aspeed_video_alloc_buf(video, &video->jpeg,
VE_JPEG_HEADER_SIZE)) {
dev_err(dev, "Failed to allocate DMA for JPEG header\n");
+ rc = -ENOMEM;
goto err_release_reserved_mem;
}