diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-10-18 18:03:35 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 13:19:02 +0100 |
| commit | c829b052de189b3ca4fb76d2f61917b67e12b83d (patch) | |
| tree | b41a6c9659ed54b40e8d782c41dbc6889fb71e9d /sound | |
| parent | 4f550df58f4758ea023704b409830ad9c3b47771 (diff) | |
| download | linux-3.10-c829b052de189b3ca4fb76d2f61917b67e12b83d.tar.gz linux-3.10-c829b052de189b3ca4fb76d2f61917b67e12b83d.tar.bz2 linux-3.10-c829b052de189b3ca4fb76d2f61917b67e12b83d.zip | |
[ALSA] intel8x0 - Fix handling of module parameters
Modules: Intel8x0 driver
- Set buggy_irq parameter before registration of irq handler.
- Clean up module parameter handling.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/intel8x0.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index fc2fba8129e..d16ef527716 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -2563,7 +2563,6 @@ struct ich_reg_info { static int __devinit snd_intel8x0_create(snd_card_t * card, struct pci_dev *pci, unsigned long device_type, - int buggy_sem, intel8x0_t ** r_intel8x0) { intel8x0_t *chip; @@ -2621,7 +2620,12 @@ static int __devinit snd_intel8x0_create(snd_card_t * card, chip->card = card; chip->pci = pci; chip->irq = -1; - chip->buggy_semaphore = buggy_sem; + + /* module parameters */ + chip->buggy_irq = buggy_irq; + chip->buggy_semaphore = buggy_semaphore; + if (xbox) + chip->xbox = 1; if (pci->vendor == PCI_VENDOR_ID_INTEL && pci->device == PCI_DEVICE_ID_INTEL_440MX) @@ -2819,14 +2823,10 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci, } if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data, - buggy_semaphore, &chip)) < 0) { + &chip)) < 0) { snd_card_free(card); return err; } - if (buggy_irq) - chip->buggy_irq = 1; - if (xbox) - chip->xbox = 1; if ((err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk)) < 0) { snd_card_free(card); |