Commit 5187df40 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: i2c: ov5647: 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.

Acked-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent b9be93aa

drivers/media/i2c/ov5647.c

+5 −4
Original line number Diff line number Diff line
@@ -882,20 +882,20 @@ static int ov5647_s_stream(struct v4l2_subdev *sd, int enable) 
	}



	if (enable) {

		ret = pm_runtime_get_sync(&client->dev);

		ret = pm_runtime_resume_and_get(&client->dev);

		if (ret < 0)

			goto error_unlock;



		ret = ov5647_stream_on(sd);

		if (ret < 0) {

			dev_err(&client->dev, "stream start failed: %d\n", ret);

			goto error_unlock;

			goto error_pm;

		}

	} else {

		ret = ov5647_stream_off(sd);

		if (ret < 0) {

			dev_err(&client->dev, "stream stop failed: %d\n", ret);

			goto error_unlock;

			goto error_pm;

		}

		pm_runtime_put(&client->dev);

	}
@@ -905,8 +905,9 @@ static int ov5647_s_stream(struct v4l2_subdev *sd, int enable) 


	return 0;



error_unlock:

error_pm:

	pm_runtime_put(&client->dev);

error_unlock:

	mutex_unlock(&sensor->lock);



	return ret;