Commit e932f5b4 authored by Alaa Emad's avatar Alaa Emad Committed by Greg Kroah-Hartman

media: gspca: mt9m111: Check write_bridge for timeout

If m5602_write_bridge times out, it will return a negative error value.
So properly check for this and handle the error correctly instead of
just ignoring it.

Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarAlaa Emad <alaaemadhossney.ae@gmail.com>
Link: https://lore.kernel.org/r/20210503115736.2104747-62-gregkh@linuxfoundation.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8c3be2f
...@@ -195,7 +195,7 @@ static const struct v4l2_ctrl_config mt9m111_greenbal_cfg = { ...@@ -195,7 +195,7 @@ static const struct v4l2_ctrl_config mt9m111_greenbal_cfg = {
int mt9m111_probe(struct sd *sd) int mt9m111_probe(struct sd *sd)
{ {
u8 data[2] = {0x00, 0x00}; u8 data[2] = {0x00, 0x00};
int i; int i, err;
struct gspca_dev *gspca_dev = (struct gspca_dev *)sd; struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;
if (force_sensor) { if (force_sensor) {
...@@ -213,15 +213,17 @@ int mt9m111_probe(struct sd *sd) ...@@ -213,15 +213,17 @@ int mt9m111_probe(struct sd *sd)
/* Do the preinit */ /* Do the preinit */
for (i = 0; i < ARRAY_SIZE(preinit_mt9m111); i++) { for (i = 0; i < ARRAY_SIZE(preinit_mt9m111); i++) {
if (preinit_mt9m111[i][0] == BRIDGE) { if (preinit_mt9m111[i][0] == BRIDGE) {
m5602_write_bridge(sd, err = m5602_write_bridge(sd,
preinit_mt9m111[i][1], preinit_mt9m111[i][1],
preinit_mt9m111[i][2]); preinit_mt9m111[i][2]);
} else { } else {
data[0] = preinit_mt9m111[i][2]; data[0] = preinit_mt9m111[i][2];
data[1] = preinit_mt9m111[i][3]; data[1] = preinit_mt9m111[i][3];
m5602_write_sensor(sd, err = m5602_write_sensor(sd,
preinit_mt9m111[i][1], data, 2); preinit_mt9m111[i][1], data, 2);
} }
if (err < 0)
return err;
} }
if (m5602_read_sensor(sd, MT9M111_SC_CHIPVER, data, 2)) if (m5602_read_sensor(sd, MT9M111_SC_CHIPVER, data, 2))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment