diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 00:03:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 00:03:58 +0100 |
| commit | da8ab21cfea80655a0f7bbbc3f2fa0975970b8cb (patch) | |
| tree | 66d5a4804f0a15b5dc224bb2de9b0d9cb208eb91 /sound/soc/codecs/adav80x.c | |
| parent | Merge remote-tracking branch 'asoc/fix/spear' into asoc-linus (diff) | |
| parent | ASoC: Fix use after free (diff) | |
| download | linux-da8ab21cfea80655a0f7bbbc3f2fa0975970b8cb.tar.xz linux-da8ab21cfea80655a0f7bbbc3f2fa0975970b8cb.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/codecs/adav80x.c')
| -rw-r--r-- | sound/soc/codecs/adav80x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index f78b27a7c461..d50cf5b29a27 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -722,7 +722,7 @@ static int adav80x_dai_startup(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = dai->codec; struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec); - if (!codec->active || !adav80x->rate) + if (!snd_soc_codec_is_active(codec) || !adav80x->rate) return 0; return snd_pcm_hw_constraint_minmax(substream->runtime, @@ -735,7 +735,7 @@ static void adav80x_dai_shutdown(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = dai->codec; struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec); - if (!codec->active) + if (!snd_soc_codec_is_active(codec)) adav80x->rate = 0; } |