diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-12 12:55:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-12 12:55:42 -0700 |
| commit | e5ad8b6d1ef82a83b1469fe66e40e06f07f46222 (patch) | |
| tree | f89178e274809d9673570cda53f7aaf9c32fa272 /sound/pci/hda/hda_sysfs.c | |
| parent | ed1e33dded773ead96d047a34286e27feafd0505 (diff) | |
| parent | 84add303ef950b8d85f54bc2248c2bc73467c329 (diff) | |
| download | linux-e5ad8b6d1ef82a83b1469fe66e40e06f07f46222.tar.gz | |
Merge tag 'sound-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"This is a pretty boring pull request as you wish: including a few
small and trivial HD-audio and USB-audio quirks and a couple of small
regression fixes in HD-audio"
* tag 'sound-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: Yet another Phoneix Audio device quirk
ALSA: hda - Fix regression on ATI HDMI audio
ALSA: hda - Fix subwoofer pin on ASUS N751 and N551
ALSA: hda - Fix broken reconfig
ALSA: hda - Fix white noise on Asus UX501VW headset
ALSA: usb-audio: Quirk for yet another Phoenix Audio devices (v2)
Diffstat (limited to 'sound/pci/hda/hda_sysfs.c')
| -rw-r--r-- | sound/pci/hda/hda_sysfs.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c index 64e0d1d81ca5..9739fce9e032 100644 --- a/sound/pci/hda/hda_sysfs.c +++ b/sound/pci/hda/hda_sysfs.c @@ -141,14 +141,6 @@ static int reconfig_codec(struct hda_codec *codec) err = snd_hda_codec_configure(codec); if (err < 0) goto error; - /* rebuild PCMs */ - err = snd_hda_codec_build_pcms(codec); - if (err < 0) - goto error; - /* rebuild mixers */ - err = snd_hda_codec_build_controls(codec); - if (err < 0) - goto error; err = snd_card_register(codec->card); error: snd_hda_power_down(codec); |