From: Sakari Ailus <sakari.ailus@linux.intel.com>
Date: Fri, 12 Apr 2024 12:56:49 +0000 (+0300)
Subject: media: v4l2-ctrls: Return handler error in creating new fwnode properties
X-Git-Tag: v6.10-rc1~135^2~195
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9134bd7bb6c5fe289f17d44a9e8b4c53e26f099;p=thirdparty%2Fkernel%2Flinux.git

media: v4l2-ctrls: Return handler error in creating new fwnode properties

If the control handler is in an error state, return that error immediately
in v4l2_ctrl_new_fwnode_properties(). Effectively the change here is that
the same error code (handler's error) is returned in all cases instead of
possibly returning -EINVAL.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---

diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c
index 9a09a981e1d96..c59dd691f79f6 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls-core.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c
@@ -2567,6 +2567,9 @@ int v4l2_ctrl_new_fwnode_properties(struct v4l2_ctrl_handler *hdl,
 				    const struct v4l2_ctrl_ops *ctrl_ops,
 				    const struct v4l2_fwnode_device_properties *p)
 {
+	if (hdl->error)
+		return hdl->error;
+
 	if (p->orientation != V4L2_FWNODE_PROPERTY_UNSET) {
 		u32 orientation_ctrl;