Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da3e1805 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] staging: atomisp: Ignore errors from second gpio in ov2680 driver 



As the existing comment in the driver indicates the sensor has only 1 pin,
but some boards may have 2 gpios defined and we toggle both as we we don't
know which one is the right one. However if the ACPI resources table
defines only 1 gpio (as expected) the gpio1_ctrl call will always fail,
causing the probing of the driver to file.

This commit ignore the return value of the gpio1_ctrl call, fixing this.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 22b2807d

drivers/staging/media/atomisp/i2c/ov2680.c

+4 −3
Original line number Diff line number Diff line
@@ -885,11 +885,12 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag) 
	if (flag) {

		ret = dev->platform_data->gpio0_ctrl(sd, 1);

		usleep_range(10000, 15000);

		ret |= dev->platform_data->gpio1_ctrl(sd, 1);

		/* Ignore return from second gpio, it may not be there */

		dev->platform_data->gpio1_ctrl(sd, 1);

		usleep_range(10000, 15000);

	} else {

		ret = dev->platform_data->gpio1_ctrl(sd, 0);

		ret |= dev->platform_data->gpio0_ctrl(sd, 0);

		dev->platform_data->gpio1_ctrl(sd, 0);

		ret = dev->platform_data->gpio0_ctrl(sd, 0);

	}

	return ret;

}