media: i2c: ov5640: Check for devm_gpiod_get_optional() error
authorFabio Estevam <festevam@gmail.com>
Fri, 28 Jun 2019 11:00:34 +0000 (07:00 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2019 11:09:35 +0000 (13:09 +0200)
[ Upstream commit 8791a102ce579346cea9d2f911afef1c1985213c ]

The power down and reset GPIO are optional, but the return value
from devm_gpiod_get_optional() needs to be checked and propagated
in the case of error, so that probe deferral can work.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/i2c/ov5640.c

index d5c0ffc..a3bbef6 100644 (file)
@@ -2787,9 +2787,14 @@ static int ov5640_probe(struct i2c_client *client,
        /* request optional power down pin */
        sensor->pwdn_gpio = devm_gpiod_get_optional(dev, "powerdown",
                                                    GPIOD_OUT_HIGH);
+       if (IS_ERR(sensor->pwdn_gpio))
+               return PTR_ERR(sensor->pwdn_gpio);
+
        /* request optional reset pin */
        sensor->reset_gpio = devm_gpiod_get_optional(dev, "reset",
                                                     GPIOD_OUT_HIGH);
+       if (IS_ERR(sensor->reset_gpio))
+               return PTR_ERR(sensor->reset_gpio);
 
        v4l2_i2c_subdev_init(&sensor->sd, client, &ov5640_subdev_ops);