diff options
| author |   Oder Chiou <oder_chiou@realtek.com> | 2021-06-07 17:22:36 -0500 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2021-06-08 13:36:38 +0100 |
| commit | 9266d95405ae0c078f188ec8bca3a004631be429 (patch) | |
| tree | 474fac1cc4470e16a70fab71f89474db0775053c /sound/soc/codecs/rt5682-sdw.c | |
| parent | ASoC: rt715-sdca: fix clock stop prepare timeout issue (diff) | |
| download | wireguard-linux-9266d95405ae0c078f188ec8bca3a004631be429.tar.xz wireguard-linux-9266d95405ae0c078f188ec8bca3a004631be429.zip | |
ASoC: rt5682: Fix a problem with error handling in the io init function of the soundwire
The device checking error should be a jump to pm_runtime_put_autosuspend()
as done before returning value.
Fixes: 867f8d18df4f ('ASoC: rt5682: fix getting the wrong device id when the suspend_stress_test')
Reviewed-by: Bard Liao <bard.liao@intel.com>
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210607222239.582139-13-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt5682-sdw.c')
| -rw-r--r-- | sound/soc/codecs/rt5682-sdw.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c index 8e4bb9dd194e..529a85fd0a00 100644 --- a/sound/soc/codecs/rt5682-sdw.c +++ b/sound/soc/codecs/rt5682-sdw.c @@ -408,9 +408,11 @@ static int rt5682_io_init(struct device *dev, struct sdw_slave *slave) usleep_range(30000, 30005); loop--; } + if (val != DEVICE_ID) { dev_err(dev, "Device with ID register %x is not rt5682\n", val); - return -ENODEV; + ret = -ENODEV; + goto err_nodev; } if (rt5682->first_hw_init) { @@ -486,10 +488,11 @@ reinit: rt5682->hw_init = true; rt5682->first_hw_init = true; +err_nodev: pm_runtime_mark_last_busy(&slave->dev); pm_runtime_put_autosuspend(&slave->dev); - dev_dbg(&slave->dev, "%s hw_init complete\n", __func__); + dev_dbg(&slave->dev, "%s hw_init complete: %d\n", __func__, ret); return ret; } |