media: i2c: imx334: Enable runtime PM before sub-device registration

[ Upstream commit 01dfdf6a80c57151af0589af0db7adbbdd1361c7 ]

Runtime PM is fully initialized before calling
v4l2_async_register_subdev_sensor(). Moving the runtime PM initialization
earlier prevents potential access to an uninitialized or powered-down
device.

Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/i2c/imx334.c b/drivers/media/i2c/imx334.c
index 062125501788adbce169a4f9f43dc9bcd57da087..57b7416bbfab30ba0bebf653837a1ae47cd4cbc6 100644 (file)
--- a/drivers/media/i2c/imx334.c
+++ b/drivers/media/i2c/imx334.c
@@ -1058,6 +1058,9 @@ static int imx334_probe(struct i2c_client *client)
                goto error_handler_free;
        }
 
+       pm_runtime_set_active(imx334->dev);
+       pm_runtime_enable(imx334->dev);
+
        ret = v4l2_async_register_subdev_sensor(&imx334->sd);
        if (ret < 0) {
                dev_err(imx334->dev,
@@ -1065,13 +1068,13 @@ static int imx334_probe(struct i2c_client *client)
                goto error_media_entity;
        }
 
-       pm_runtime_set_active(imx334->dev);
-       pm_runtime_enable(imx334->dev);
        pm_runtime_idle(imx334->dev);
 
        return 0;
 
 error_media_entity:
+       pm_runtime_disable(imx334->dev);
+       pm_runtime_set_suspended(imx334->dev);
        media_entity_cleanup(&imx334->sd.entity);
 error_handler_free:
        v4l2_ctrl_handler_free(imx334->sd.ctrl_handler);