Skip to content

Commit e953796

Browse files
rfvirgilvinodkoul
authored andcommitted
soundwire: bus: Fix unbalanced pm_runtime_put() causing usage count underflow
This reverts commit 443a98e ("soundwire: bus: use pm_runtime_resume_and_get()") Change calls to pm_runtime_resume_and_get() back to pm_runtime_get_sync(). This fixes a usage count underrun caused by doing a pm_runtime_put() even though pm_runtime_resume_and_get() returned an error. The three affected functions ignore -EACCES error from trying to get pm_runtime, and carry on, including a put at the end of the function. But pm_runtime_resume_and_get() does not increment the usage count if it returns an error. So in the -EACCES case you must not call pm_runtime_put(). The documentation for pm_runtime_get_sync() says: "Consider using pm_runtime_resume_and_get() ... as this is likely to result in cleaner code." In this case I don't think it results in cleaner code because the pm_runtime_put() at the end of the function would have to be conditional on the return value from pm_runtime_resume_and_get() at the top of the function. pm_runtime_get_sync() doesn't have this problem because it always increments the count, so always needs a put. The code can just flow through and do the pm_runtime_put() unconditionally. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20230406134640.8582-1-rf@opensource.cirrus.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 0a0d174 commit e953796

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

drivers/soundwire/bus.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -584,9 +584,11 @@ int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val)
584584
{
585585
int ret;
586586

587-
ret = pm_runtime_resume_and_get(&slave->dev);
588-
if (ret < 0 && ret != -EACCES)
587+
ret = pm_runtime_get_sync(&slave->dev);
588+
if (ret < 0 && ret != -EACCES) {
589+
pm_runtime_put_noidle(&slave->dev);
589590
return ret;
591+
}
590592

591593
ret = sdw_nread_no_pm(slave, addr, count, val);
592594

@@ -613,9 +615,11 @@ int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, const u8 *val)
613615
{
614616
int ret;
615617

616-
ret = pm_runtime_resume_and_get(&slave->dev);
617-
if (ret < 0 && ret != -EACCES)
618+
ret = pm_runtime_get_sync(&slave->dev);
619+
if (ret < 0 && ret != -EACCES) {
620+
pm_runtime_put_noidle(&slave->dev);
618621
return ret;
622+
}
619623

620624
ret = sdw_nwrite_no_pm(slave, addr, count, val);
621625

@@ -1590,9 +1594,10 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
15901594

15911595
sdw_modify_slave_status(slave, SDW_SLAVE_ALERT);
15921596

1593-
ret = pm_runtime_resume_and_get(&slave->dev);
1597+
ret = pm_runtime_get_sync(&slave->dev);
15941598
if (ret < 0 && ret != -EACCES) {
15951599
dev_err(&slave->dev, "Failed to resume device: %d\n", ret);
1600+
pm_runtime_put_noidle(&slave->dev);
15961601
return ret;
15971602
}
15981603

0 commit comments

Comments
 (0)