Changeset 246 for GPL/branches/alsa-resync1/alsa-kernel/drivers/mtpav.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/drivers/mtpav.c (modified) (4 diffs)

GPL/branches/alsa-resync1/alsa-kernel/drivers/mtpav.c

@@ -103 +103 @@
  *      defines
  */
-//#define USE_FAKE_MTP //       dont actually read/write to MTP device (for debugging without an actual unit) (does not work yet)
+//#define USE_FAKE_MTP //       don't actually read/write to MTP device (for debugging without an actual unit) (does not work yet)
 
 // parallel port usage masks
@@ -587 +587 @@
 }
 
-static void snd_mtpav_irqh(int irq, void *dev_id, struct pt_regs *regs)
-{
-        mtpav_t *mcard = snd_magic_cast(mtpav_t, dev_id, return);
+static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id, struct pt_regs *regs)
+{
+        mtpav_t *mcard = snd_magic_cast(mtpav_t, dev_id, return IRQ_NONE);
 
         //printk("irqh()\n");
@@ -595 +595 @@
         snd_mtpav_read_bytes(mcard);
         spin_unlock(&mcard->spinlock);
+        return IRQ_HANDLED;
 }
 
@@ -765 +766 @@
                 goto __error;
 
-        err = snd_card_register(mtp_card->card);        // dont snd_card_register until AFTER all cards reources done!
+        err = snd_card_register(mtp_card->card);        // don't snd_card_register until AFTER all cards reources done!
 
         //printk("snd_card_register returned %d\n", err);