aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/mtpav.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-23 19:35:50 -0400
committerTakashi Iwai <tiwai@suse.de>2009-03-23 19:35:50 -0400
commite0d2054fd3cf167395390dc1758644486c782707 (patch)
tree108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/drivers/mtpav.c
parentd807500a2472445d05ce641bf09438e3d72eeb4f (diff)
parentc468ac29e63b9927275a94379d00b367f0f97c43 (diff)
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/drivers/mtpav.c')
-rw-r--r--sound/drivers/mtpav.c12
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,
303 303
304 snd_mtpav_send_byte(mtp_card, 0xf5); 304 snd_mtpav_send_byte(mtp_card, 0xf5);
305 snd_mtpav_send_byte(mtp_card, portp->hwport); 305 snd_mtpav_send_byte(mtp_card, portp->hwport);
306 //snd_printk("new outport: 0x%x\n", (unsigned int) portp->hwport); 306 /*
307 307 snd_printk(KERN_DEBUG "new outport: 0x%x\n",
308 (unsigned int) portp->hwport);
309 */
308 if (!(outbyte & 0x80) && portp->running_status) 310 if (!(outbyte & 0x80) && portp->running_status)
309 snd_mtpav_send_byte(mtp_card, portp->running_status); 311 snd_mtpav_send_byte(mtp_card, portp->running_status);
310 } 312 }
@@ -540,7 +542,7 @@ static void snd_mtpav_read_bytes(struct mtpav *mcrd)
540 542
541 u8 sbyt = snd_mtpav_getreg(mcrd, SREG); 543 u8 sbyt = snd_mtpav_getreg(mcrd, SREG);
542 544
543 //printk("snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt); 545 /* printk(KERN_DEBUG "snd_mtpav_read_bytes() sbyt: 0x%x\n", sbyt); */
544 546
545 if (!(sbyt & SIGS_BYTE)) 547 if (!(sbyt & SIGS_BYTE))
546 return; 548 return;
@@ -585,12 +587,12 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id)
585static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard) 587static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
586{ 588{
587 if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) { 589 if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {
588 snd_printk("MTVAP port 0x%lx is busy\n", port); 590 snd_printk(KERN_ERR "MTVAP port 0x%lx is busy\n", port);
589 return -EBUSY; 591 return -EBUSY;
590 } 592 }
591 mcard->port = port; 593 mcard->port = port;
592 if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) { 594 if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
593 snd_printk("MTVAP IRQ %d busy\n", irq); 595 snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);
594 return -EBUSY; 596 return -EBUSY;
595 } 597 }
596 mcard->irq = irq; 598 mcard->irq = irq;