media: i2c: ov4689: Enable runtime PM before registering sub-device

As the sensor may be accessible right after its async sub-device is
registered, enable runtime PM before doing so.

Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c
index 56f6d47c7674bc9aa9a9adbe69f0d2485023fe70..dcbffa270deafabb919b01015f2288399e2ba731 100644 (file)
--- a/drivers/media/i2c/ov4689.c
+++ b/drivers/media/i2c/ov4689.c
@@ -875,19 +875,21 @@ static int ov4689_probe(struct i2c_client *client)
                goto err_clean_entity;
        }
 
+       pm_runtime_set_active(dev);
+       pm_runtime_enable(dev);
+       pm_runtime_idle(dev);
+
        ret = v4l2_async_register_subdev_sensor(sd);
        if (ret) {
                dev_err(dev, "v4l2 async register subdev failed\n");
-               goto err_clean_subdev;
+               goto err_clean_subdev_pm;
        }
 
-       pm_runtime_set_active(dev);
-       pm_runtime_enable(dev);
-       pm_runtime_idle(dev);
-
        return 0;
 
-err_clean_subdev:
+err_clean_subdev_pm:
+       pm_runtime_disable(dev);
+       pm_runtime_set_suspended(dev);
        v4l2_subdev_cleanup(sd);
 err_clean_entity:
        media_entity_cleanup(&sd->entity);