summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-04-23 17:19:11 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-05-19 09:51:42 +0200
commit2450f59d24166c8af60aa075e9dec4466f905c1f (patch)
treeb5b777ff3055ccc45c4c8d904d2a692d10517bf3 /drivers/media/i2c
parenta959a7bf3b939494adca95b1c53e98b74fd90702 (diff)
downloadlinux-stable-2450f59d24166c8af60aa075e9dec4466f905c1f.tar.gz
linux-stable-2450f59d24166c8af60aa075e9dec4466f905c1f.tar.bz2
linux-stable-2450f59d24166c8af60aa075e9dec4466f905c1f.zip
media: i2c: ccs-core: 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. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/ccs/ccs-core.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index 4a848ac2d2cd..a349189a38db 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -3101,12 +3101,9 @@ static int __maybe_unused ccs_suspend(struct device *dev)
bool streaming = sensor->streaming;
int rval;
- rval = pm_runtime_get_sync(dev);
- if (rval < 0) {
- pm_runtime_put_noidle(dev);
-
+ rval = pm_runtime_resume_and_get(dev);
+ if (rval < 0)
return rval;
- }
if (sensor->streaming)
ccs_stop_streaming(sensor);