Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 23:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

regmap: fix bogus error on regcache_sync success

Browse Source 
Since commit 0ec7731655 ("regmap: Ensure range selector registers
are updated after cache sync") opening pcm512x based soundcards fail
with EINVAL and dmesg shows sync cache and pm_runtime_get errors:

[  228.794676] pcm512x 1-004c: Failed to sync cache: -22
[  228.794740] pcm512x 1-004c: ASoC: error at snd_soc_pcm_component_pm_runtime_get on pcm512x.1-004c: -22

This is caused by the cache check result leaking out into the
regcache_sync return value.

Fix this by making the check local-only, as the comment above the
regcache_read call states a non-zero return value means there's
nothing to do so the return value should not be altered.

Fixes: 0ec7731655 ("regmap: Ensure range selector registers are updated after cache sync")
Cc: stable@vger.kernel.org
Signed-off-by: Matthias Reichl <hias@horus.com>
Link: https://lore.kernel.org/r/20231203222216.96547-1-hias@horus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Matthias Reichl 2023-12-03 23:22:16 +01:00 committed by Mark Brown
parent b85ea95d08
commit fea8806444
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/base/regmap/regcache.c
View File

@ -410,8 +410,7 @@ out:
rb_entry(node, struct regmap_range_node, node); rb_entry(node, struct regmap_range_node, node);
/* If there's nothing in the cache there's nothing to sync */ /* If there's nothing in the cache there's nothing to sync */
ret = regcache_read(map, this->selector_reg, &i); if (regcache_read(map, this->selector_reg, &i) != 0)
if (ret != 0)
continue; continue;
ret = _regmap_write(map, this->selector_reg, i); ret = _regmap_write(map, this->selector_reg, i);