media: i2c: ov2685: use pm_runtime_resume_and_get()

Commit dd8088d5a896 ("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: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/i2c/ov2685.c b/drivers/media/i2c/ov2685.c
index 49a2dce..2f3836d 100644 (file)
--- a/drivers/media/i2c/ov2685.c
+++ b/drivers/media/i2c/ov2685.c
@@ -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);