Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1:/tmp/cvs-serv32501
Modified Files: es1968.c Log Message: fixed the lock-up of some notebooks with a docking station when the module is loaded. irq is enabled after all components are ready. Index: es1968.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- es1968.c 7 Jul 2003 12:34:38 -0000 1.42 +++ es1968.c 14 Jul 2003 10:28:47 -0000 1.43 @@ -2345,11 +2345,6 @@ outb(3, iobase + ASSP_CONTROL_A); /* M: Reserved bits... */ outb(0, iobase + ASSP_CONTROL_C); /* M: Disable ASSP, ASSP IRQ's and FM Port */ - /* Enable IRQ's */ - w = ESM_HIRQ_DSIE | ESM_HIRQ_MPU401 | ESM_HIRQ_HW_VOLUME; - outw(w, iobase + ESM_PORT_HOST_IRQ); - - /* * set up wavecache */ @@ -2419,6 +2414,14 @@ } } +/* Enable IRQ's */ +static void snd_es1968_start_irq(es1968_t *chip) +{ + unsigned short w; + w = ESM_HIRQ_DSIE | ESM_HIRQ_MPU401 | ESM_HIRQ_HW_VOLUME; + outw(w, chip->io_port + ESM_PORT_HOST_IRQ); +} + #ifdef CONFIG_PM /* * PM support @@ -2458,6 +2461,8 @@ wave_set_register(chip, 0x01FC, chip->dma.addr >> 12); } + snd_es1968_start_irq(chip); + /* restore ac97 state */ snd_ac97_resume(chip->ac97); @@ -2761,6 +2766,8 @@ return err; } } + + snd_es1968_start_irq(chip); chip->clock = clock[dev]; if (! chip->clock) ------------------------------------------------------- This SF.Net email sponsored by: Parasoft Error proof Web apps, automate testing & more. Download & eval WebKing and get a free book. www.parasoft.com/bulletproofapps1 _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog