Skip to content

Commit

Permalink
[media] m5602_ov7660: return error at ov7660_init()
Browse files Browse the repository at this point in the history
It used to be a code that returns arror at ov7660_init.
However, this was removed by changeset c84e412:

@@ -231,33 +116,40 @@ int ov7660_init(struct sd *sd)
        if (dump_sensor)
                ov7660_dump_registers(sd);

-   err = ov7660_set_gain(&sd->gspca_dev, sensor_settings[GAIN_IDX]);
-   if (err < 0)
-           return err;
+ return 0;
+}

-   err = ov7660_set_auto_white_balance(&sd->gspca_dev,
-           sensor_settings[AUTO_WHITE_BALANCE_IDX]);
-   if (err < 0)
-           return err;

As complained by gcc:
	drivers/media/usb/gspca/m5602/m5602_ov7660.c: In function 'ov7660_init':
	drivers/media/usb/gspca/m5602/m5602_ov7660.c:99:9: warning: variable 'err' set but not used [-Wunused-but-set-variable]

It should be noticed that the original error code was crappy, as it wasn't
returning any error if sensor init fails.

Fix it by returning an error if the sensor can't be initialized.

Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Mar 22, 2013
1 parent 39ed126 commit 9dc033f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/media/usb/gspca/m5602/m5602_ov7660.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ int ov7660_probe(struct sd *sd)

int ov7660_init(struct sd *sd)
{
int i, err = 0;
int i, err;

/* Init the sensor */
for (i = 0; i < ARRAY_SIZE(init_ov7660); i++) {
Expand All @@ -111,6 +111,8 @@ int ov7660_init(struct sd *sd)
err = m5602_write_sensor(sd,
init_ov7660[i][1], data, 1);
}
if (err < 0)
return err;
}

if (dump_sensor)
Expand Down

0 comments on commit 9dc033f

Please sign in to comment.