Commit d8c3be2f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "media: gspca: mt9m111: Check write_bridge for timeout" 

This reverts commit 65602585.

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-61-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6d822c5

drivers/media/usb/gspca/m5602/m5602_mt9m111.c

+3 −5
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static const struct v4l2_ctrl_config mt9m111_greenbal_cfg = { 
int mt9m111_probe(struct sd *sd)

{

	u8 data[2] = {0x00, 0x00};

	int i, rc = 0;

	int i;

	struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;



	if (force_sensor) {
@@ -213,18 +213,16 @@ int mt9m111_probe(struct sd *sd) 
	/* Do the preinit */

	for (i = 0; i < ARRAY_SIZE(preinit_mt9m111); i++) {

		if (preinit_mt9m111[i][0] == BRIDGE) {

			rc |= m5602_write_bridge(sd,

			m5602_write_bridge(sd,

				preinit_mt9m111[i][1],

				preinit_mt9m111[i][2]);

		} else {

			data[0] = preinit_mt9m111[i][2];

			data[1] = preinit_mt9m111[i][3];

			rc |= m5602_write_sensor(sd,

			m5602_write_sensor(sd,

				preinit_mt9m111[i][1], data, 2);

		}

	}

	if (rc < 0)

		return rc;



	if (m5602_read_sensor(sd, MT9M111_SC_CHIPVER, data, 2))

		return -ENODEV;