media: i2c: ov5648: use pm_runtime_resume_and_get()
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 23 Apr 2021 15:19:15 +0000 (17:19 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 19 May 2021 07:51:41 +0000 (09:51 +0200)
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>
drivers/media/i2c/ov5648.c

index 3ecb4a3..07e64ff 100644 (file)
@@ -2132,11 +2132,9 @@ static int ov5648_s_stream(struct v4l2_subdev *subdev, int enable)
        int ret;
 
        if (enable) {
-               ret = pm_runtime_get_sync(sensor->dev);
-               if (ret < 0) {
-                       pm_runtime_put_noidle(sensor->dev);
+               ret = pm_runtime_resume_and_get(sensor->dev);
+               if (ret < 0)
                        return ret;
-               }
        }
 
        mutex_lock(&sensor->mutex);