Commit c8992923 authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] disable legacy IRQs before request_irq() to avoid unhandled interrupts

VIA82xx driver
Signed-off-by: default avatarChristian Koerner <ckoerner@sysgo.com>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent d392f636
......@@ -1635,8 +1635,6 @@ static int snd_via8233_init_misc(via82xx_t *chip, int dev)
int i, err, caps;
unsigned char val;
pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE,
chip->old_legacy & ~(VIA_FUNC_ENABLE_SB|VIA_FUNC_ENABLE_FM));
caps = chip->chip_type == TYPE_VIA8233A ? 1 : 2;
for (i = 0; i < caps; i++) {
snd_via8233_capture_source.index = i;
......@@ -1673,7 +1671,6 @@ static int snd_via686_init_misc(via82xx_t *chip, int dev)
legacy_cfg = chip->old_legacy_cfg;
legacy |= VIA_FUNC_MIDI_IRQMASK; /* FIXME: correct? (disable MIDI) */
legacy &= ~VIA_FUNC_ENABLE_GAME; /* disable joystick */
legacy &= ~(VIA_FUNC_ENABLE_SB|VIA_FUNC_ENABLE_FM); /* diable SB & FM */
if (chip->revision >= VIA_REV_686_H) {
rev_h = 1;
if (mpu_port[dev] >= 0x200) { /* force MIDI */
......@@ -2025,6 +2022,8 @@ static int __devinit snd_via82xx_create(snd_card_t * card,
pci_read_config_byte(pci, VIA_FUNC_ENABLE, &chip->old_legacy);
pci_read_config_byte(pci, VIA_PNP_CONTROL, &chip->old_legacy_cfg);
pci_write_config_byte(chip->pci, VIA_FUNC_ENABLE,
chip->old_legacy & ~(VIA_FUNC_ENABLE_SB|VIA_FUNC_ENABLE_FM));
if ((err = pci_request_regions(pci, card->driver)) < 0) {
kfree(chip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment