diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-11-05 11:41:23 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-05 11:41:23 -0500 |
commit | 6834d7ce224a6f6a1dd05da3a867730c40943154 (patch) | |
tree | a2d9376fb24f35d3e376c5cc11d21939028a9aa9 /sound/pci | |
parent | 4074ea21493fe668501bfc7548d10657ca6f14c2 (diff) |
ALSA: ice1724 - Re-fix IRQ mask initialization
The previous IRQ mask initialization was wrong. It must set the bits
to be masked.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 40725dfdc864..0dfa0540ce2c 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -395,8 +395,8 @@ static irqreturn_t snd_vt1724_interrupt(int irq, void *dev_id) | |||
395 | "status = 0x%x\n", status); | 395 | "status = 0x%x\n", status); |
396 | if (status & VT1724_IRQ_MPU_TX) { | 396 | if (status & VT1724_IRQ_MPU_TX) { |
397 | printk(KERN_ERR "ice1724: Disabling MPU_TX\n"); | 397 | printk(KERN_ERR "ice1724: Disabling MPU_TX\n"); |
398 | outb(inb(ICEREG1724(ice, IRQMASK)) & | 398 | outb(inb(ICEREG1724(ice, IRQMASK)) | |
399 | ~VT1724_IRQ_MPU_TX, | 399 | VT1724_IRQ_MPU_TX, |
400 | ICEREG1724(ice, IRQMASK)); | 400 | ICEREG1724(ice, IRQMASK)); |
401 | } | 401 | } |
402 | break; | 402 | break; |
@@ -2413,8 +2413,8 @@ static int __devinit snd_vt1724_create(struct snd_card *card, | |||
2413 | return -EIO; | 2413 | return -EIO; |
2414 | } | 2414 | } |
2415 | 2415 | ||
2416 | /* clear interrupts -- otherwise you'll get irq problems later */ | 2416 | /* MPU_RX and TX irq masks are cleared later dynamically */ |
2417 | outb(0, ICEREG1724(ice, IRQMASK)); | 2417 | outb(VT1724_IRQ_MPU_RX | VT1724_IRQ_MPU_TX , ICEREG1724(ice, IRQMASK)); |
2418 | 2418 | ||
2419 | /* don't handle FIFO overrun/underruns (just yet), | 2419 | /* don't handle FIFO overrun/underruns (just yet), |
2420 | * since they cause machine lockups | 2420 | * since they cause machine lockups |