summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTarang Raval <tarang.raval@siliconsignals.io>2025-03-29 11:13:29 +0530
committerHans Verkuil <hverkuil@xs4all.nl>2025-04-25 10:15:38 +0200
commit01dfdf6a80c57151af0589af0db7adbbdd1361c7 (patch)
treedcd6a8c395a3b5ae4c56119e8459ed9ed49461d2
parentb493cd3c03641f9bbaa9787e43ca92163cb50051 (diff)
media: i2c: imx334: Enable runtime PM before sub-device registration
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>
-rw-r--r--drivers/media/i2c/imx334.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/i2c/imx334.c b/drivers/media/i2c/imx334.c
index 2ede0787be14b..412ab469b1301 100644
--- a/drivers/media/i2c/imx334.c
+++ b/drivers/media/i2c/imx334.c
@@ -1287,6 +1287,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,
@@ -1294,13 +1297,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);