OSDN Git Service

ASoC: omap-twl4030: Use card DAPM context to access widgets
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 27 Apr 2015 10:15:02 +0000 (12:15 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 6 May 2015 17:53:58 +0000 (18:53 +0100)
Use the card DAPM context instead of the CODEC DAPM context since only card
level widgets are accessed here.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/omap/omap-twl4030.c

index 3673ada..7431314 100644 (file)
@@ -159,9 +159,8 @@ static inline void twl4030_disconnect_pin(struct snd_soc_dapm_context *dapm,
 
 static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)
 {
-       struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_card *card = rtd->card;
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
+       struct snd_soc_dapm_context *dapm = &card->dapm;
        struct omap_tw4030_pdata *pdata = dev_get_platdata(card->dev);
        struct omap_twl4030 *priv = snd_soc_card_get_drvdata(card);
        int ret = 0;