diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
| commit | d71f4cece4bd97d05592836202fc04ff2e7817e3 (patch) | |
| tree | 6c877c7a938758b1323d9c97d46b9c536e618c69 /sound/soc/codecs/ak4671.c | |
| parent | 19008bdacb9f7841166ebafe0aef361ee582ffbf (diff) | |
| parent | ad8332c1302bcb4f80d593fd3eb477be9d7f5604 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
sound/soc/codecs/ad1938.c
Diffstat (limited to 'sound/soc/codecs/ak4671.c')
| -rw-r--r-- | sound/soc/codecs/ak4671.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c index 926797a014c7..87566932a3b1 100644 --- a/sound/soc/codecs/ak4671.c +++ b/sound/soc/codecs/ak4671.c | |||
| @@ -702,7 +702,7 @@ static int ak4671_register(struct ak4671_priv *ak4671, | |||
| 702 | INIT_LIST_HEAD(&codec->dapm_widgets); | 702 | INIT_LIST_HEAD(&codec->dapm_widgets); |
| 703 | INIT_LIST_HEAD(&codec->dapm_paths); | 703 | INIT_LIST_HEAD(&codec->dapm_paths); |
| 704 | 704 | ||
| 705 | codec->private_data = ak4671; | 705 | snd_soc_codec_set_drvdata(codec, ak4671); |
| 706 | codec->name = "AK4671"; | 706 | codec->name = "AK4671"; |
| 707 | codec->owner = THIS_MODULE; | 707 | codec->owner = THIS_MODULE; |
| 708 | codec->bias_level = SND_SOC_BIAS_OFF; | 708 | codec->bias_level = SND_SOC_BIAS_OFF; |