Merge branch 'topic/misc' into for-linus

1 files changed, 7 insertions, 5 deletions

diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 0e17d2b5ce19..2f8f295d6b0c 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -303,8 +303,10 @@ static void snd_mtpav_output_port_write(struct mtpav *mtp_card,
 
                 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);
         }
@@ -540,7 +542,7 @@ static void snd_mtpav_read_bytes(struct mtpav *mcrd)
 
         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))
                 return;
@@ -585,12 +587,12 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)
 static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
 {
         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;
         }
         mcard->irq = irq;