summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-04-27 12:15:02 +0200
committerMark Brown <broonie@kernel.org>2015-05-06 18:53:58 +0100
commita9843112b49af71f98c3953625555517f4a748bd (patch)
treefc97a42e135129b33eed794612b9dd52f20a8083 /sound/soc/omap
parentb787f68c36d49bb1d9236f403813641efa74a031 (diff)
downloadlinux-stable-a9843112b49af71f98c3953625555517f4a748bd.tar.gz
linux-stable-a9843112b49af71f98c3953625555517f4a748bd.tar.bz2
linux-stable-a9843112b49af71f98c3953625555517f4a748bd.zip
ASoC: omap-twl4030: Use card DAPM context to access widgets
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>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/omap-twl4030.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index 3673ada43bfb..743131473056 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -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;