diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:16 +0800 |
| commit | 1d48c75353cb265710f7589f47532e1db06cb64f (patch) | |
| tree | ebfded7d10d45cfb718c76159de227b593716d5c /sound/pci/hda/hda_sysfs.c | |
| parent | 71d97a95427b3c9c11788a8e6dd0117551d29166 (diff) | |
| parent | 0a296a966f183e4ef1fcb37940940e8df8c4f258 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.05-android
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 a6e3d9b511ab..aa6121c2dd84 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); |