2023-12-03 22:22:46

by Matthias Reichl

[permalink] [raw]
Subject: [PATCH] regmap: fix bogus error on regcache_sync success

Since commit 0ec7731655de ("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: 0ec7731655de ("regmap: Ensure range selector registers are updated after cache sync")
Cc: [email protected]
Signed-off-by: Matthias Reichl <[email protected]>
---
drivers/base/regmap/regcache.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 92592f944a3d..ac63a73ccdaa 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -410,8 +410,7 @@ int regcache_sync(struct regmap *map)
rb_entry(node, struct regmap_range_node, node);

/* If there's nothing in the cache there's nothing to sync */
- ret = regcache_read(map, this->selector_reg, &i);
- if (ret != 0)
+ if (regcache_read(map, this->selector_reg, &i) != 0)
continue;

ret = _regmap_write(map, this->selector_reg, i);
--
2.39.2


2023-12-04 16:29:52

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] regmap: fix bogus error on regcache_sync success

On Sun, 03 Dec 2023 23:22:16 +0100, Matthias Reichl wrote:
> Since commit 0ec7731655de ("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
>
> [...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next

Thanks!

[1/1] regmap: fix bogus error on regcache_sync success
commit: fea88064445a59584460f7f67d102b6e5fc1ca1d

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark