[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: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/atomisp/i2c/ov2680.c b/drivers/staging/media/atomisp/i2c/ov2680.c
index 449aa2aa276f0eebb201f47234237bca54c4344c..6dd466558701ad15a6cf4ede947d47231e081865 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/ov2680.c
@@ -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;
 }