diff options
Diffstat (limited to 'sound/pci/ens1370.c')
-rw-r--r-- | sound/pci/ens1370.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index bef9a59f46d7..b4d0a9c2b0b5 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
@@ -508,7 +508,7 @@ static unsigned int snd_es1371_wait_src_ready(ensoniq_t * ensoniq) | |||
508 | return r; | 508 | return r; |
509 | cond_resched(); | 509 | cond_resched(); |
510 | } | 510 | } |
511 | snd_printk("wait source ready timeout 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_SMPRATE), r); | 511 | snd_printk(KERN_ERR "wait source ready timeout 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_SMPRATE), r); |
512 | return 0; | 512 | return 0; |
513 | } | 513 | } |
514 | 514 | ||
@@ -579,7 +579,7 @@ static void snd_es1370_codec_write(ak4531_t *ak4531, | |||
579 | set_current_state(TASK_UNINTERRUPTIBLE); | 579 | set_current_state(TASK_UNINTERRUPTIBLE); |
580 | schedule_timeout(1); | 580 | schedule_timeout(1); |
581 | } while (time_after(end_time, jiffies)); | 581 | } while (time_after(end_time, jiffies)); |
582 | snd_printk("codec write timeout, status = 0x%x\n", inl(ES_REG(ensoniq, STATUS))); | 582 | snd_printk(KERN_ERR "codec write timeout, status = 0x%x\n", inl(ES_REG(ensoniq, STATUS))); |
583 | } | 583 | } |
584 | 584 | ||
585 | #endif /* CHIP1370 */ | 585 | #endif /* CHIP1370 */ |
@@ -620,7 +620,7 @@ static void snd_es1371_codec_write(ac97_t *ac97, | |||
620 | } | 620 | } |
621 | } | 621 | } |
622 | up(&ensoniq->src_mutex); | 622 | up(&ensoniq->src_mutex); |
623 | snd_printk("codec write timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC))); | 623 | snd_printk(KERN_ERR "codec write timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC))); |
624 | } | 624 | } |
625 | 625 | ||
626 | static unsigned short snd_es1371_codec_read(ac97_t *ac97, | 626 | static unsigned short snd_es1371_codec_read(ac97_t *ac97, |
@@ -667,14 +667,14 @@ static unsigned short snd_es1371_codec_read(ac97_t *ac97, | |||
667 | } | 667 | } |
668 | up(&ensoniq->src_mutex); | 668 | up(&ensoniq->src_mutex); |
669 | if (++fail > 10) { | 669 | if (++fail > 10) { |
670 | snd_printk("codec read timeout (final) at 0x%lx, reg = 0x%x [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), reg, inl(ES_REG(ensoniq, 1371_CODEC))); | 670 | snd_printk(KERN_ERR "codec read timeout (final) at 0x%lx, reg = 0x%x [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), reg, inl(ES_REG(ensoniq, 1371_CODEC))); |
671 | return 0; | 671 | return 0; |
672 | } | 672 | } |
673 | goto __again; | 673 | goto __again; |
674 | } | 674 | } |
675 | } | 675 | } |
676 | up(&ensoniq->src_mutex); | 676 | up(&ensoniq->src_mutex); |
677 | snd_printk("es1371: codec read timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC))); | 677 | snd_printk(KERN_ERR "es1371: codec read timeout at 0x%lx [0x%x]\n", ES_REG(ensoniq, 1371_CODEC), inl(ES_REG(ensoniq, 1371_CODEC))); |
678 | return 0; | 678 | return 0; |
679 | } | 679 | } |
680 | 680 | ||
@@ -1960,7 +1960,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card, | |||
1960 | } | 1960 | } |
1961 | ensoniq->port = pci_resource_start(pci, 0); | 1961 | ensoniq->port = pci_resource_start(pci, 0); |
1962 | if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ, "Ensoniq AudioPCI", (void *)ensoniq)) { | 1962 | if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ, "Ensoniq AudioPCI", (void *)ensoniq)) { |
1963 | snd_printk("unable to grab IRQ %d\n", pci->irq); | 1963 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1964 | snd_ensoniq_free(ensoniq); | 1964 | snd_ensoniq_free(ensoniq); |
1965 | return -EBUSY; | 1965 | return -EBUSY; |
1966 | } | 1966 | } |
@@ -1968,7 +1968,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card, | |||
1968 | #ifdef CHIP1370 | 1968 | #ifdef CHIP1370 |
1969 | if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), | 1969 | if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), |
1970 | 16, &ensoniq->dma_bug) < 0) { | 1970 | 16, &ensoniq->dma_bug) < 0) { |
1971 | snd_printk("unable to allocate space for phantom area - dma_bug\n"); | 1971 | snd_printk(KERN_ERR "unable to allocate space for phantom area - dma_bug\n"); |
1972 | snd_ensoniq_free(ensoniq); | 1972 | snd_ensoniq_free(ensoniq); |
1973 | return -EBUSY; | 1973 | return -EBUSY; |
1974 | } | 1974 | } |