p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: cs4349: Fix suspend/resume 

dev_get_drvdata() will not return the snd_soc_runtime to which this CODEC
is attached, so the current code will result in undefined behavior.
To fix this just use regmap_update_bits(cs4349->regmap, ...) directly
instead of snd_soc_update_bits(rtd->codec, ...).

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2015-07-19 12:15:17 +02:00 committed by Mark Brown
parent b08b338253
commit cb2510dac7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/cs4349.c
View File

@ -328,10 +328,9 @@ static int cs4349_i2c_remove(struct i2c_client *client)
static int cs4349_runtime_suspend(struct device *dev)
{
struct cs4349_private *cs4349 = dev_get_drvdata(dev);
struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
int ret;
ret = snd_soc_update_bits(rtd->codec, CS4349_MISC, PWR_DWN, 1);
ret = regmap_update_bits(cs4349->regmap, CS4349_MISC, PWR_DWN, 1);
if (ret < 0)
return ret;
@ -347,10 +346,9 @@ static int cs4349_runtime_suspend(struct device *dev)
static int cs4349_runtime_resume(struct device *dev)
{
struct cs4349_private *cs4349 = dev_get_drvdata(dev);
struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
int ret;
ret = snd_soc_update_bits(rtd->codec, CS4349_MISC, PWR_DWN, 0);
ret = regmap_update_bits(cs4349->regmap, CS4349_MISC, PWR_DWN, 0);
if (ret < 0)
return ret;