diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-03 13:57:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-13 18:58:32 +0200 |
| commit | dacb408ca6f0e34df22b40d8dd5fae7f8e777d84 (patch) | |
| tree | 7fa353f5126c0b24e288407f223fb1d007a4e591 /drivers/media/usb/gspca | |
| parent | 8e23e83c752b54e98102627a1cc09281ad71a299 (diff) | |
| download | linux-stable-dacb408ca6f0e34df22b40d8dd5fae7f8e777d84.tar.gz linux-stable-dacb408ca6f0e34df22b40d8dd5fae7f8e777d84.tar.bz2 linux-stable-dacb408ca6f0e34df22b40d8dd5fae7f8e777d84.zip | |
media: gspca: properly check for errors in po1030_probe()
If m5602_write_sensor() or m5602_write_bridge() fail, do not continue to
initialize the device but return the error to the calling funtion.
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Link: https://lore.kernel.org/r/20210503115736.2104747-64-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/usb/gspca')
| -rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_po1030.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/m5602/m5602_po1030.c b/drivers/media/usb/gspca/m5602/m5602_po1030.c index 7bdbb8065146..8fd99ceee4b6 100644 --- a/drivers/media/usb/gspca/m5602/m5602_po1030.c +++ b/drivers/media/usb/gspca/m5602/m5602_po1030.c @@ -155,6 +155,7 @@ static const struct v4l2_ctrl_config po1030_greenbal_cfg = { int po1030_probe(struct sd *sd) { u8 dev_id_h = 0, i; + int err; struct gspca_dev *gspca_dev = (struct gspca_dev *)sd; if (force_sensor) { @@ -173,10 +174,13 @@ int po1030_probe(struct sd *sd) for (i = 0; i < ARRAY_SIZE(preinit_po1030); i++) { u8 data = preinit_po1030[i][2]; if (preinit_po1030[i][0] == SENSOR) - m5602_write_sensor(sd, - preinit_po1030[i][1], &data, 1); + err = m5602_write_sensor(sd, preinit_po1030[i][1], + &data, 1); else - m5602_write_bridge(sd, preinit_po1030[i][1], data); + err = m5602_write_bridge(sd, preinit_po1030[i][1], + data); + if (err < 0) + return err; } if (m5602_read_sensor(sd, PO1030_DEVID_H, &dev_id_h, 1)) |