From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Fri, 22 Sep 2017 17:45:33 +0200

Add jump targets 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/gspca/sn9c20x.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/media/usb/gspca/sn9c20x.c 
b/drivers/media/usb/gspca/sn9c20x.c
index c605f78d6186..282bbd77d815 100644
--- a/drivers/media/usb/gspca/sn9c20x.c
+++ b/drivers/media/usb/gspca/sn9c20x.c
@@ -1788,10 +1788,8 @@ static int sd_init(struct gspca_dev *gspca_dev)
        for (i = 0; i < ARRAY_SIZE(bridge_init); i++) {
                value = bridge_init[i][1];
                reg_w(gspca_dev, bridge_init[i][0], &value, 1);
-               if (gspca_dev->usb_err < 0) {
-                       pr_err("Device initialization failed\n");
-                       return gspca_dev->usb_err;
-               }
+               if (gspca_dev->usb_err < 0)
+                       goto report_failure;
        }
 
        if (sd->flags & LED_REVERSE)
@@ -1800,10 +1798,8 @@ static int sd_init(struct gspca_dev *gspca_dev)
                reg_w1(gspca_dev, 0x1006, 0x20);
 
        reg_w(gspca_dev, 0x10c0, i2c_init, 9);
-       if (gspca_dev->usb_err < 0) {
-               pr_err("Device initialization failed\n");
-               return gspca_dev->usb_err;
-       }
+       if (gspca_dev->usb_err < 0)
+               goto report_failure;
 
        switch (sd->sensor) {
        case SENSOR_OV9650:
@@ -1869,6 +1865,11 @@ static int sd_init(struct gspca_dev *gspca_dev)
                pr_err("Unsupported sensor\n");
                gspca_dev->usb_err = -ENODEV;
        }
+       goto exit;
+
+report_failure:
+       pr_err("Device initialization failed\n");
+exit:
        return gspca_dev->usb_err;
 }
 
-- 
2.14.1

Reply via email to