Commit cb2510da authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b08b3382
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment