diff options
author | Bard Liao <yung-chuan.liao@linux.intel.com> | 2023-08-04 11:47:34 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-08-04 13:26:51 +0100 |
commit | 385311101538b071a487a9245e01349e3a68ed2c (patch) | |
tree | 028fdc7f9b8220ab08cd8b8c5f46fd1782e68a62 /sound/soc/codecs | |
parent | f803ec63686dec863a33cad87218d7d99c4b5e92 (diff) | |
download | linux-stable-385311101538b071a487a9245e01349e3a68ed2c.tar.gz linux-stable-385311101538b071a487a9245e01349e3a68ed2c.tar.bz2 linux-stable-385311101538b071a487a9245e01349e3a68ed2c.zip |
ASoC: max98363: don't return on success reading revision ID
max98363_io_init needs to keep going when we read revision ID
successfully.
Fixes: 18c0af945fa3 ("ASoC: max98363: add soundwire amplifier driver")
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20230804034734.3848227-1-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/max98363.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/max98363.c b/sound/soc/codecs/max98363.c index b5c69bba0e48..2dfaf4fcfbd3 100644 --- a/sound/soc/codecs/max98363.c +++ b/sound/soc/codecs/max98363.c @@ -185,10 +185,10 @@ static int max98363_io_init(struct sdw_slave *slave) pm_runtime_get_noresume(dev); ret = regmap_read(max98363->regmap, MAX98363_R21FF_REV_ID, ®); - if (!ret) { + if (!ret) dev_info(dev, "Revision ID: %X\n", reg); - return ret; - } + else + goto out; if (max98363->first_hw_init) { regcache_cache_bypass(max98363->regmap, false); @@ -198,10 +198,11 @@ static int max98363_io_init(struct sdw_slave *slave) max98363->first_hw_init = true; max98363->hw_init = true; +out: pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); - return 0; + return ret; } #define MAX98363_RATES SNDRV_PCM_RATE_8000_192000 |