diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-16 06:50:49 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-16 06:50:49 (GMT) |
| commit | a9104f989916aac5d92bfa2c51915d5985fb2e6c (patch) | |
| tree | 17bef4eac561e3ac90d98d68190978e686712b67 /sound/pci/ac97/ac97_patch.c | |
| parent | ad6cfc2ac71180171e090e69ae8762ac511884b1 (diff) | |
| parent | 89c0ac7cab2440a771ba1e2ab953186bc9c29786 (diff) | |
| download | linux-fsl-qoriq-a9104f989916aac5d92bfa2c51915d5985fb2e6c.tar.xz | |
Merge branch 'topic/misc' into fix/misc
Diffstat (limited to 'sound/pci/ac97/ac97_patch.c')
| -rw-r--r-- | sound/pci/ac97/ac97_patch.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index d9266ba..1caf5e3 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -544,25 +544,10 @@ static int patch_wolfson04(struct snd_ac97 * ac97) return 0; } -static int patch_wolfson_wm9705_specific(struct snd_ac97 * ac97) -{ - int err, i; - for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) { - if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm97xx_snd_ac97_controls[i], ac97))) < 0) - return err; - } - snd_ac97_write_cache(ac97, 0x72, 0x0808); - return 0; -} - -static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = { - .build_specific = patch_wolfson_wm9705_specific, -}; - static int patch_wolfson05(struct snd_ac97 * ac97) { /* WM9705, WM9710 */ - ac97->build_ops = &patch_wolfson_wm9705_ops; + ac97->build_ops = &patch_wolfson_wm9703_ops; #ifdef CONFIG_TOUCHSCREEN_WM9705 /* WM9705 touchscreen uses AUX and VIDEO for touch */ ac97->flags |= AC97_HAS_NO_VIDEO | AC97_HAS_NO_AUX; |