summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-01 10:01:50 (GMT)
committerTakashi Iwai <tiwai@suse.de>2008-11-01 10:03:52 (GMT)
commit4074ea21493fe668501bfc7548d10657ca6f14c2 (patch)
treec702fd64d2f68ef6555514d4ae44a1d1a4c0a929
parent9cbbb3ac628227ec5b65fc043539949db606cd17 (diff)
downloadlinux-4074ea21493fe668501bfc7548d10657ca6f14c2.tar.xz
ALSA: ice1724 - Fix IRQ register initialization
The IRQMASK register has to be set to zero expclitily at the initialization otherwise you'll get no interrupts properly at later operations. Also, removed the old commented out codes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/ice1712/ice1724.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 79a9cd0..40725df 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2353,7 +2353,6 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
{
struct snd_ice1712 *ice;
int err;
- /* unsigned char mask; */
static struct snd_device_ops ops = {
.dev_free = snd_vt1724_dev_free,
};
@@ -2414,11 +2413,9 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
return -EIO;
}
- /* unmask used interrupts */
-#if 0 /* these are enabled/disabled dynamically */
- mask = VT1724_IRQ_MPU_RX | VT1724_IRQ_MPU_TX;
- outb(mask, ICEREG1724(ice, IRQMASK));
-#endif
+ /* clear interrupts -- otherwise you'll get irq problems later */
+ outb(0, ICEREG1724(ice, IRQMASK));
+
/* don't handle FIFO overrun/underruns (just yet),
* since they cause machine lockups
*/