Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e1e7489 authored by Sakari Ailus's avatar Sakari Ailus Committed by Greg Kroah-Hartman
Browse files

media: smiapp: Register sensor after enabling runtime PM on the device 



[ Upstream commit 90c9e4a4dba9f4de331372e745fb1991c1faa598 ]

Earlier it was possible that the parts of the driver that assumed runtime
PM was enabled were being called before runtime PM was enabled in the
driver's probe function. So enable runtime PM before registering the
sub-device.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 00f0f294

drivers/media/i2c/smiapp/smiapp-core.c

+8 −4
Original line number Diff line number Diff line
@@ -3108,19 +3108,23 @@ static int smiapp_probe(struct i2c_client *client, 
	if (rval < 0)

		goto out_media_entity_cleanup;



	rval = v4l2_async_register_subdev_sensor_common(&sensor->src->sd);

	if (rval < 0)

		goto out_media_entity_cleanup;



	pm_runtime_set_active(&client->dev);

	pm_runtime_get_noresume(&client->dev);

	pm_runtime_enable(&client->dev);



	rval = v4l2_async_register_subdev_sensor_common(&sensor->src->sd);

	if (rval < 0)

		goto out_disable_runtime_pm;



	pm_runtime_set_autosuspend_delay(&client->dev, 1000);

	pm_runtime_use_autosuspend(&client->dev);

	pm_runtime_put_autosuspend(&client->dev);



	return 0;



out_disable_runtime_pm:

	pm_runtime_disable(&client->dev);



out_media_entity_cleanup:

	media_entity_cleanup(&sensor->src->sd.entity);