1 files changed, 14 insertions, 21 deletions

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
index ccea4a75846..9bea347b9ef 100644
--- a/drivers/media/video/gspca/m5602/m5602_s5k83a.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c
@@ -163,12 +163,11 @@ int s5k83a_get_brightness(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_read_sensor(sd, S5K83A_BRIGHTNESS, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         data[1] = data[1] << 1;
         *val = data[1];
 
-out:
         return err;
 }
 
@@ -182,13 +181,13 @@ int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
         data[1] = 0x20;
         err = m5602_write_sensor(sd, 0x14, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         data[0] = 0x01;
         data[1] = 0x00;
         err = m5602_write_sensor(sd, 0x0d, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         /* FIXME: This is not sane, we need to figure out the composition
                   of these registers */
@@ -196,7 +195,6 @@ int s5k83a_set_brightness(struct gspca_dev *gspca_dev, __s32 val)
         data[1] = val >> 1; /* brightness, high 7 bits */
         err = m5602_write_sensor(sd, S5K83A_BRIGHTNESS, data, 2);
 
-out:
         return err;
 }
 
@@ -208,11 +206,10 @@ int s5k83a_get_whiteness(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_read_sensor(sd, S5K83A_WHITENESS, &data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         *val = data;
 
-out:
         return err;
 }
 
@@ -236,7 +233,7 @@ int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 
         err = m5602_read_sensor(sd, S5K83A_GAIN, data, 2);
         if (err < 0)
-                goto out;
+                return err;
 
         data[1] = data[1] & 0x3f;
         if (data[1] > S5K83A_MAXIMUM_GAIN)
@@ -244,7 +241,6 @@ int s5k83a_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 
         *val = data[1];
 
-out:
         return err;
 }
 
@@ -269,12 +265,11 @@ int s5k83a_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
         data[0] = 0x05;
         err = m5602_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K83A_FLIP, data, 1);
         *val = (data[0] | 0x40) ? 1 : 0;
 
-out:
         return err;
 }
 
@@ -287,23 +282,22 @@ int s5k83a_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
         data[0] = 0x05;
         err = m5602_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K83A_FLIP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         /* set or zero six bit, seven is hflip */
         data[0] = (val) ? (data[0] & 0x80) | 0x40 | S5K83A_FLIP_MASK
                         : (data[0] & 0x80) | S5K83A_FLIP_MASK;
         err = m5602_write_sensor(sd, S5K83A_FLIP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         data[0] = (val) ? 0x0b : 0x0a;
         err = m5602_write_sensor(sd, S5K83A_VFLIP_TUNE, data, 1);
 
-out:
         return err;
 }
 
@@ -316,12 +310,11 @@ int s5k83a_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
         data[0] = 0x05;
         err = m5602_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K83A_FLIP, data, 1);
         *val = (data[0] | 0x80) ? 1 : 0;
 
-out:
         return err;
 }
 
@@ -334,21 +327,21 @@ int s5k83a_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
         data[0] = 0x05;
         err = m5602_write_sensor(sd, S5K83A_PAGE_MAP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         err = m5602_read_sensor(sd, S5K83A_FLIP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         /* set or zero seven bit, six is vflip */
         data[0] = (val) ? (data[0] & 0x40) | 0x80 | S5K83A_FLIP_MASK
                         : (data[0] & 0x40) | S5K83A_FLIP_MASK;
         err = m5602_write_sensor(sd, S5K83A_FLIP, data, 1);
         if (err < 0)
-                goto out;
+                return err;
 
         data[0] = (val) ? 0x0a : 0x0b;
         err = m5602_write_sensor(sd, S5K83A_HFLIP_TUNE, data, 1);
-out:
+
         return err;
 }