diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-14 17:42:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-14 17:42:28 +0100 |
| commit | aa0258adf6078a41a3db06f4e498253aff64d151 (patch) | |
| tree | 26d293e3cd249d2946c6def872fa4bd88ed65669 /sound/soc/codecs/da9055.c | |
| parent | 1a39019e939f620f39a1b914231ab6ba9013b208 (diff) | |
| parent | b37f1d123c69c0d7730704d65b83eaac780c0e3b (diff) | |
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Conflicts:
sound/soc/soc-core.c
Diffstat (limited to 'sound/soc/codecs/da9055.c')
| -rw-r--r-- | sound/soc/codecs/da9055.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index 4ff06b50fbb..ad19cc56702 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c @@ -484,7 +484,7 @@ static int da9055_get_alc_data(struct snd_soc_codec *codec, u8 reg_val) static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); u8 reg_val, adc_left, adc_right, mic_left, mic_right; int avg_left_data, avg_right_data, offset_l, offset_r; |