OSDN Git Service

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

index cdccaab..ee21274 100644 (file)
@@ -1441,9 +1441,8 @@ static int imx274_s_stream(struct v4l2_subdev *sd, int on)
        mutex_lock(&imx274->lock);
 
        if (on) {
-               ret = pm_runtime_get_sync(&imx274->client->dev);
+               ret = pm_runtime_resume_and_get(&imx274->client->dev);
                if (ret < 0) {
-                       pm_runtime_put_noidle(&imx274->client->dev);
                        mutex_unlock(&imx274->lock);
                        return ret;
                }