diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-26 08:32:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-26 12:14:49 +0100 |
| commit | d82ad8e0c0ecc49e81bf7d57fdc09b7d76c1afc0 (patch) | |
| tree | df819814633bf1b2a22a423c4ef67b462ba0871c /sound/pci | |
| parent | Merge branch 'topic/hw-constraint-single' into for-next (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and '... (diff) | |
| download | linux-d82ad8e0c0ecc49e81bf7d57fdc09b7d76c1afc0.tar.xz linux-d82ad8e0c0ecc49e81bf7d57fdc09b7d76c1afc0.zip | |
Merge tag 'asoc-v4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v4.4
Not much core work here, a few small tweaks to interfaces but mainly the
changes here are driver ones. Highlights include:
- Updates to the topology userspace interface
- Big updates to the Renesas support from Morimoto-san
- Most of the support for Intel Sky Lake systems.
- New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10,
Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825 and Rockchip
S/PDIF.
- A new driver for the Atmel Class D speaker drivers
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 2eeaf5ea20f9..83741887faa1 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3323,10 +3323,8 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec) int dev, err; err = snd_hda_codec_parse_pcms(codec); - if (err < 0) { - snd_hda_codec_reset(codec); + if (err < 0) return err; - } /* attach a new PCM streams */ list_for_each_entry(cpcm, &codec->pcm_list_head, list) { |