[PATCH 1/3] [media] uvcvideo: Use common error handling code in uvc_ioctl_g_ext_ctrls()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Thu, 21 Sep 2017 20:47:02 +0200

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/media/usb/uvc/uvc_v4l2.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 3e7e283a44a8..6ec2b255c44a 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -998,10 +998,8 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void 
*fh,
                        struct v4l2_queryctrl qc = { .id = ctrl->id };
 
                        ret = uvc_query_v4l2_ctrl(chain, &qc);
-                       if (ret < 0) {
-                               ctrls->error_idx = i;
-                               return ret;
-                       }
+                       if (ret < 0)
+                               goto set_index;
 
                        ctrl->value = qc.default_value;
                }
@@ -1017,14 +1015,17 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, 
void *fh,
                ret = uvc_ctrl_get(chain, ctrl);
                if (ret < 0) {
                        uvc_ctrl_rollback(handle);
-                       ctrls->error_idx = i;
-                       return ret;
+                       goto set_index;
                }
        }
 
        ctrls->error_idx = 0;
 
        return uvc_ctrl_rollback(handle);
+
+set_index:
+       ctrls->error_idx = i;
+       return ret;
 }
 
 static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *handle,
-- 
2.14.1