Changeset 348 for GPL/branches/alsa-resync1/alsa-kernel/drivers/serial-u16550.c

Timestamp:

Apr 21, 2008, 2:52:19 AM (17 years ago)

Author:

Brendan Oakley

Message:

alsa-resync1 branch merged to ALSA 1.0.4

File:

• GPL/branches/alsa-resync1/alsa-kernel/drivers/serial-u16550.c (modified) (2 diffs)

GPL/branches/alsa-resync1/alsa-kernel/drivers/serial-u16550.c

@@ -352 +352 @@
 
     /* Do some vague tests for the presence of the uart */
-        if (io_base == 0) {
+        if (io_base == 0 || io_base == SNDRV_AUTO_PORT) {
         return -ENODEV; /* Not configured */
         }
@@ -830 +830 @@
         }
 
-    if (irq >= 0) {
+        if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
         if (request_irq(irq, snd_uart16550_interrupt,
                         SA_INTERRUPT, "Serial MIDI", (void *) uart)) {
-            uart->irq = -1;
             snd_printk("irq %d busy. Using Polling.\n", irq);
         } else {