Changeset 246 for GPL/branches/alsa-resync1/alsa-kernel/isa/sgalaxy.c

Timestamp:

Aug 22, 2007, 5:33:25 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.3

File:

• GPL/branches/alsa-resync1/alsa-kernel/isa/sgalaxy.c (modified) (2 diffs)

GPL/branches/alsa-resync1/alsa-kernel/isa/sgalaxy.c

@@ -113 +113 @@
 }
 
-static void snd_sgalaxy_dummy_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
+static irqreturn_t snd_sgalaxy_dummy_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        return IRQ_NONE;
 }
 
@@ -307 +308 @@
         if (!cards) {
 #ifdef MODULE
-                printk(KERN_ERR "Sound Galaxy soundcard not found or device busy\n");
+                snd_printk(KERN_ERR "Sound Galaxy soundcard not found or device busy\n");
 #endif
                 return -ENODEV;