diff options
| author | Takashi Iwai | 2015-02-19 18:12:22 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2015-02-19 21:41:40 +0100 |
| commit | 96d2bd6e3cdf57926f80605d6e28051bb6b24eb3 (patch) | |
| tree | dd8378bc79a3bda6ef23786970789deb46801564 /sound/pci/hda/hda_intel.c | |
| parent | ALSA: hda - Drop azx_mixer_create() (diff) | |
| download | kernel-qcow2-linux-96d2bd6e3cdf57926f80605d6e28051bb6b24eb3.tar.gz kernel-qcow2-linux-96d2bd6e3cdf57926f80605d6e28051bb6b24eb3.tar.xz kernel-qcow2-linux-96d2bd6e3cdf57926f80605d6e28051bb6b24eb3.zip | |
ALSA: hda - Split azx_codec_create() to two phases
azx_create_codec() function does actually two things: create a bus and
probe codecs. For the future work, split this to two logical
functions, azx_bus_create() and azx_probe_codecs().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b0a05691abe7..5e00cc4a722f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1893,12 +1893,14 @@ static int azx_probe_continue(struct azx *chip) #endif /* create codec instances */ - err = azx_codec_create(chip, model[dev], - azx_max_codecs[chip->driver_type], - power_save_addr); + err = azx_bus_create(chip, model[dev], power_save_addr); + if (err < 0) + goto out_free; + err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]); if (err < 0) goto out_free; + #ifdef CONFIG_SND_HDA_PATCH_LOADER if (chip->fw) { err = snd_hda_load_patch(chip->bus, chip->fw->size, |