Changeset 426 for GPL/trunk/alsa-kernel/drivers/mtpav.c

Timestamp:

May 9, 2009, 11:45:26 AM (16 years ago)

Author:

Paul Smedley

Message:

Update alsa-kernel to ALSA 1.0.20 level

File:

• GPL/trunk/alsa-kernel/drivers/mtpav.c (modified) (5 diffs)

GPL/trunk/alsa-kernel/drivers/mtpav.c

@@ -304 +304 @@
                 snd_mtpav_send_byte(mtp_card, 0xf5);
                 snd_mtpav_send_byte(mtp_card, portp->hwport);
-                //snd_printk("new outport: 0x%x\n", (unsigned int) portp->hwport);
-
+                /*
+                snd_printk(KERN_DEBUG "new outport: 0x%x\n",
+                           (unsigned int) portp->hwport);
+                */
                 if (!(outbyte & 0x80) && portp->running_status)
                         snd_mtpav_send_byte(mtp_card, portp->running_status);
@@ -541 +543 @@
         u8 sbyt = snd_mtpav_getreg(mcrd, SREG);
 
-        //printk("snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt);
+        /* printk(KERN_DEBUG "snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt); */
 
         if (!(sbyt & SIGS_BYTE))
@@ -586 +588 @@
 {
         if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {
-                snd_printk("MTVAP port 0x%lx is busy\n", port);
+                snd_printk(KERN_ERR "MTVAP port 0x%lx is busy\n", port);
                 return -EBUSY;
         }
         mcard->port = port;
         if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
-                snd_printk("MTVAP IRQ %d busy\n", irq);
+                snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);
                 return -EBUSY;
         }
@@ -707 +709 @@
         mtp_card->irq = -1;
         mtp_card->share_irq = 0;
-        mtp_card->inmidiport = 0xffffffff;
         mtp_card->inmidistate = 0;
         mtp_card->outmidihwport = 0xffffffff;
@@ -719 +720 @@
         if (err < 0)
                 goto __error;
+
+        mtp_card->inmidiport = mtp_card->num_ports + MTPAV_PIDX_BROADCAST;
 
         err = snd_mtpav_get_ISA(mtp_card);