Skip to content

Commit

Permalink
Revert "media: gspca: Check the return value of write_bridge for time…
Browse files Browse the repository at this point in the history
…out"

This reverts commit a21a0eb.

Because of recent interactions with developers from @umn.edu, all
commits from them have been recently re-reviewed to ensure if they were
correct or not.

Upon review, this commit was found to be incorrect for the reasons
below, so it must be reverted.  It will be fixed up "correctly" in a
later kernel change.

Different error values should never be "OR" together and expect anything
sane to come out of the result.

Cc: Aditya Pakki <pakki001@umn.edu>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Link: https://lore.kernel.org/r/20210503115736.2104747-63-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed May 13, 2021
1 parent e932f5b commit 8e23e83
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/media/usb/gspca/m5602/m5602_po1030.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ static const struct v4l2_ctrl_config po1030_greenbal_cfg = {

int po1030_probe(struct sd *sd)
{
int rc = 0;
u8 dev_id_h = 0, i;
struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;

Expand All @@ -174,14 +173,11 @@ 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)
rc |= m5602_write_sensor(sd,
m5602_write_sensor(sd,
preinit_po1030[i][1], &data, 1);
else
rc |= m5602_write_bridge(sd, preinit_po1030[i][1],
data);
m5602_write_bridge(sd, preinit_po1030[i][1], data);
}
if (rc < 0)
return rc;

if (m5602_read_sensor(sd, PO1030_DEVID_H, &dev_id_h, 1))
return -ENODEV;
Expand Down

0 comments on commit 8e23e83

Please sign in to comment.