diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-27 12:43:40 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-27 12:43:40 +0400 |
| commit | bb14eb0da72afb69be261b28ec858cbd5a35e089 (patch) | |
| tree | fa72a87d21e506c990b63657d782936311cfa7cf /sound/soc/codecs/adau1701.c | |
| parent | 9430148d800dd929ad73da4c6afb67f793f8af43 (diff) | |
| parent | 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb (diff) | |
| download | linux-bb14eb0da72afb69be261b28ec858cbd5a35e089.tar.xz | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/adau1701.c')
| -rw-r--r-- | sound/soc/codecs/adau1701.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index 2758d5fc60d6..8b7e1c50d6e9 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -401,7 +401,7 @@ static int adau1701_digital_mute(struct snd_soc_dai *dai, int mute) } static int adau1701_set_sysclk(struct snd_soc_codec *codec, int clk_id, - unsigned int freq, int dir) + int source, unsigned int freq, int dir) { unsigned int val; @@ -458,6 +458,7 @@ static int adau1701_probe(struct snd_soc_codec *codec) int ret; codec->dapm.idle_bias_off = 1; + codec->control_data = to_i2c_client(codec->dev); ret = adau1701_load_firmware(codec); if (ret) |