diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-07-19 12:15:17 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-20 19:15:28 +0200 |
| commit | cb2510dac7e1c5ac77652bb31e8c39ce2eef8bbe (patch) | |
| tree | 76887971aae9262eb5bccc6b78161d51a32ef63e /sound/soc/codecs/cs4349.c | |
| parent | ASoC: cs4349: Constify cs4349_regmap (diff) | |
| download | linux-cb2510dac7e1c5ac77652bb31e8c39ce2eef8bbe.tar.xz linux-cb2510dac7e1c5ac77652bb31e8c39ce2eef8bbe.zip | |
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>
Diffstat (limited to 'sound/soc/codecs/cs4349.c')
| -rw-r--r-- | sound/soc/codecs/cs4349.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index f4fccc621ceb..13ccbf75207e 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -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; |