diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-03-26 13:04:38 +0300 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-03-26 13:08:43 +0300 |
| commit | 10e77ddac0e1f3b9cea04dfe8180f8641f329703 (patch) | |
| tree | e93280793b107864e9ffdbf5a406b82f607e9faf /sound/pci/hda/hda_intel.c | |
| parent | 0bf0e5a6f304ac1bc93a80cdd68b4d91f3519eb5 (diff) | |
| download | linux-10e77ddac0e1f3b9cea04dfe8180f8641f329703.tar.xz | |
ALSA: hda-intel - remove model=hwio , use probe_only=3 instead
The probe_only module parameter skips the codec initialization, too.
Remove the model=hwio code and use second bit in probe_only to
skip the HDA codec reset procedure.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 8d477613bccf..6ce673c17ff2 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2577,7 +2577,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, /* initialize chip */ azx_init_pci(chip); - azx_init_chip(chip, model[dev] == NULL || strcmp(model[dev], "hwio")); + azx_init_chip(chip, (probe_only[dev] & 2) == 0); /* codec detection */ if (!chip->codec_mask) { @@ -2666,7 +2666,7 @@ static int __devinit azx_probe(struct pci_dev *pci, goto out_free; } #endif - if (!probe_only[dev]) { + if ((probe_only[dev] & 1) == 0) { err = azx_codec_configure(chip); if (err < 0) goto out_free; |