| From d37f9572fe820f1390655fe65f6e71ee30d7fb20 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 23 Apr 2021 17:04:23 +0200 |
| Subject: media: s5p: fix pm_runtime_get_sync() usage count |
| |
| From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| |
| [ Upstream commit fdc34e82c0f968ac4c157bd3d8c299ebc24c9c63 ] |
| |
| The pm_runtime_get_sync() internally increments the |
| dev->power.usage_count without decrementing it, even on errors. |
| Replace it by the new pm_runtime_resume_and_get(), introduced by: |
| commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") |
| in order to properly decrement the usage counter, avoiding |
| a potential PM usage counter leak. |
| |
| While here, check if the PM runtime error was caught at |
| s5p_cec_adap_enable(). |
| |
| Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> |
| Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/cec/platform/s5p/s5p_cec.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/cec/platform/s5p/s5p_cec.c b/drivers/media/cec/platform/s5p/s5p_cec.c |
| index 2a3e7ffefe0a..2250c1cbc64e 100644 |
| --- a/drivers/media/cec/platform/s5p/s5p_cec.c |
| +++ b/drivers/media/cec/platform/s5p/s5p_cec.c |
| @@ -35,10 +35,13 @@ MODULE_PARM_DESC(debug, "debug level (0-2)"); |
| |
| static int s5p_cec_adap_enable(struct cec_adapter *adap, bool enable) |
| { |
| + int ret; |
| struct s5p_cec_dev *cec = cec_get_drvdata(adap); |
| |
| if (enable) { |
| - pm_runtime_get_sync(cec->dev); |
| + ret = pm_runtime_resume_and_get(cec->dev); |
| + if (ret < 0) |
| + return ret; |
| |
| s5p_cec_reset(cec); |
| |
| -- |
| 2.30.2 |
| |