Commit c679b236 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: i2c: ov2685: use pm_runtime_resume_and_get() 



Commit dd8088d5 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
added pm_runtime_resume_and_get() in order to automatically handle
dev->power.usage_count decrement on errors.

Use the new API, in order to cleanup the error check logic.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c12ede18

drivers/media/i2c/ov2685.c

+3 −4
Original line number Diff line number Diff line
@@ -456,11 +456,10 @@ static int ov2685_s_stream(struct v4l2_subdev *sd, int on) 
		goto unlock_and_return;



	if (on) {

		ret = pm_runtime_get_sync(&ov2685->client->dev);

		if (ret < 0) {

			pm_runtime_put_noidle(&client->dev);

		ret = pm_runtime_resume_and_get(&ov2685->client->dev);

		if (ret < 0)

			goto unlock_and_return;

		}



		ret = __v4l2_ctrl_handler_setup(&ov2685->ctrl_handler);

		if (ret) {

			pm_runtime_put(&client->dev);