diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-10-18 12:03:35 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:19:02 -0500 |
commit | c829b052de189b3ca4fb76d2f61917b67e12b83d (patch) | |
tree | b41a6c9659ed54b40e8d782c41dbc6889fb71e9d /sound/pci/intel8x0.c | |
parent | 4f550df58f4758ea023704b409830ad9c3b47771 (diff) |
[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/pci/intel8x0.c')
-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 fc2fba8129e2..d16ef527716d 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -2563,7 +2563,6 @@ struct ich_reg_info { | |||
2563 | static int __devinit snd_intel8x0_create(snd_card_t * card, | 2563 | static int __devinit snd_intel8x0_create(snd_card_t * card, |
2564 | struct pci_dev *pci, | 2564 | struct pci_dev *pci, |
2565 | unsigned long device_type, | 2565 | unsigned long device_type, |
2566 | int buggy_sem, | ||
2567 | intel8x0_t ** r_intel8x0) | 2566 | intel8x0_t ** r_intel8x0) |
2568 | { | 2567 | { |
2569 | intel8x0_t *chip; | 2568 | intel8x0_t *chip; |
@@ -2621,7 +2620,12 @@ static int __devinit snd_intel8x0_create(snd_card_t * card, | |||
2621 | chip->card = card; | 2620 | chip->card = card; |
2622 | chip->pci = pci; | 2621 | chip->pci = pci; |
2623 | chip->irq = -1; | 2622 | chip->irq = -1; |
2624 | chip->buggy_semaphore = buggy_sem; | 2623 | |
2624 | /* module parameters */ | ||
2625 | chip->buggy_irq = buggy_irq; | ||
2626 | chip->buggy_semaphore = buggy_semaphore; | ||
2627 | if (xbox) | ||
2628 | chip->xbox = 1; | ||
2625 | 2629 | ||
2626 | if (pci->vendor == PCI_VENDOR_ID_INTEL && | 2630 | if (pci->vendor == PCI_VENDOR_ID_INTEL && |
2627 | pci->device == PCI_DEVICE_ID_INTEL_440MX) | 2631 | pci->device == PCI_DEVICE_ID_INTEL_440MX) |
@@ -2819,14 +2823,10 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci, | |||
2819 | } | 2823 | } |
2820 | 2824 | ||
2821 | if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data, | 2825 | if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data, |
2822 | buggy_semaphore, &chip)) < 0) { | 2826 | &chip)) < 0) { |
2823 | snd_card_free(card); | 2827 | snd_card_free(card); |
2824 | return err; | 2828 | return err; |
2825 | } | 2829 | } |
2826 | if (buggy_irq) | ||
2827 | chip->buggy_irq = 1; | ||
2828 | if (xbox) | ||
2829 | chip->xbox = 1; | ||
2830 | 2830 | ||
2831 | if ((err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk)) < 0) { | 2831 | if ((err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk)) < 0) { |
2832 | snd_card_free(card); | 2832 | snd_card_free(card); |