Skip to contentSkip to conversation

media: v4l2-ctrls: clean up some inconsistent indentings

PATCH In review Yang Li 2 participants 2 messages Dec 16, 2022 – Jan 27, 2023 Media (V4L/DVB)

lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/1 media: v4l2-ctrls: clean up some inconsistent indentings

clean up some inconsistent indentings to improve the readability of the code.

drivers/media/v4l2-core/v4l2-ctrls-api.c:154 user_to_new() warn: inconsistent indenting

Fixes 73278d483378 ("media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1")
---
 drivers/media/v4l2-core/v4l2-ctrls-api.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-ctrls-api.c +2 -2
index 3d3b6dc24ca6..3bee4ad5be7c 100644
@@ -150,8 +150,8 @@ static int user_to_new(struct v4l2_ext_control *c, struct v4l2_ctrl *ctrl)
 			 * then return an error.
 			 */
 			if (strlen(ctrl->p_new.p_char) == ctrl->maximum && last)
-			ctrl->is_new = 1;
-				return -ERANGE;
+				ctrl->is_new = 1;
+			return -ERANGE;
 		}
 		return ret;
 	default:
Signature · 1 line
2.20.1.7.g153144c
#1 lore raw
Quoted 4 lines · Yang Li

clean up some inconsistent indentings to improve the readability of the code.

drivers/media/v4l2-core/v4l2-ctrls-api.c:154 user_to_new() warn: inconsistent indenting

Thank you for the patch, but the actual fix is already on its way to mainline:

https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/

Rejecting this in patchwork.

Regards,

Hans

Quoted 24 lines
Fixes 73278d483378 ("media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1")
---
 drivers/media/v4l2-core/v4l2-ctrls-api.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-ctrls-api.c +2 -2
index 3d3b6dc24ca6..3bee4ad5be7c 100644
@@ -150,8 +150,8 @@ static int user_to_new(struct v4l2_ext_control *c, struct v4l2_ctrl *ctrl)
 			 * then return an error.
 			 */
 			if (strlen(ctrl->p_new.p_char) == ctrl->maximum && last)
-			ctrl->is_new = 1;
-				return -ERANGE;
+				ctrl->is_new = 1;
+			return -ERANGE;
 		}
 		return ret;
 	default: