mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
ASoC: max98363: don't return on success reading revision ID
[ Upstream commit3853111015] max98363_io_init needs to keep going when we read revision ID successfully. Fixes:18c0af945f("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
66f202b1dc
commit
5fb0d35fac
@@ -191,10 +191,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);
|
||||
@@ -204,10 +204,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
|
||||
|
||||
Reference in New Issue
Block a user