From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Date: Wed, 20 Jan 2021 08:36:29 +0000 (+0100)
Subject: media: davinci/vpbe.c: ret contains the return code, not err
X-Git-Tag: howlett/maple/20220722_2~3757^2~150
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7692057d9cc5f534a47ce1fea6648bfed9f130f8;p=users%2Fjedix%2Flinux-maple.git

media: davinci/vpbe.c: ret contains the return code, not err

Fixes this smatch warning:

drivers/media/platform/davinci/vpbe.c:632 vpbe_initialize() warn: missing error code 'ret'

The function returns 'ret', but instead 'err' was set to -ENOMEM.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index fe9468b180e6b..5f0aeb744e81b 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -628,7 +628,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
 		if (err) {
 			v4l2_err(&vpbe_dev->v4l2_dev,
 				 "unable to initialize the OSD device");
-			err = -ENOMEM;
+			ret = -ENOMEM;
 			goto fail_dev_unregister;
 		}
 	}