diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 07:48:51 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 07:48:51 -0400 |
| commit | 5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36 (patch) | |
| tree | 1272753ff995b96c610c922f1963fb454f900311 /sound/soc/omap | |
| parent | 832a94143c549bc750350c4e770f1f604e6aaffb (diff) | |
| parent | b2d9de549c30170eed5691d369cf16680e0ce03a (diff) | |
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/rx51.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 943922c79f78..b10ae8074461 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, | |||
| 168 | static int rx51_hp_event(struct snd_soc_dapm_widget *w, | 168 | static int rx51_hp_event(struct snd_soc_dapm_widget *w, |
| 169 | struct snd_kcontrol *k, int event) | 169 | struct snd_kcontrol *k, int event) |
| 170 | { | 170 | { |
| 171 | struct snd_soc_codec *codec = w->dapm->codec; | 171 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); |
| 172 | 172 | ||
| 173 | if (SND_SOC_DAPM_EVENT_ON(event)) | 173 | if (SND_SOC_DAPM_EVENT_ON(event)) |
| 174 | tpa6130a2_stereo_enable(codec, 1); | 174 | tpa6130a2_stereo_enable(codec, 1); |