summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:48:51 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:48:51 +0100
commit5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36 (patch)
tree1272753ff995b96c610c922f1963fb454f900311 /sound/soc/omap
parent832a94143c549bc750350c4e770f1f604e6aaffb (diff)
parentb2d9de549c30170eed5691d369cf16680e0ce03a (diff)
downloadop-kernel-dev-5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36.zip
op-kernel-dev-5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36.tar.gz
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/rx51.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 943922c..b10ae80 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -168,7 +168,7 @@ static int rx51_spk_event(struct snd_soc_dapm_widget *w,
static int rx51_hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event)
{
- struct snd_soc_codec *codec = w->dapm->codec;
+ struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
if (SND_SOC_DAPM_EVENT_ON(event))
tpa6130a2_stereo_enable(codec, 1);
OpenPOWER on IntegriCloud