Skip to content

Commit

Permalink
media: s5p: fix pm_runtime_get_sync() usage count
Browse files Browse the repository at this point in the history
[ Upstream commit fdc34e8 ]

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 dd8088d ("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>
  • Loading branch information
mchehab authored and gregkh committed Jul 14, 2021
1 parent 437ca06 commit adf052c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/media/cec/platform/s5p/s5p_cec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit adf052c

Please sign in to comment.