diff options
Diffstat (limited to 'sound/pci/es1938.c')
-rw-r--r-- | sound/pci/es1938.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 34a78afc26d0..fbd2ac09aa34 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -1608,8 +1608,8 @@ static int __devinit snd_es1938_create(struct snd_card *card, | |||
1608 | if ((err = pci_enable_device(pci)) < 0) | 1608 | if ((err = pci_enable_device(pci)) < 0) |
1609 | return err; | 1609 | return err; |
1610 | /* check, if we can restrict PCI DMA transfers to 24 bits */ | 1610 | /* check, if we can restrict PCI DMA transfers to 24 bits */ |
1611 | if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 || | 1611 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 || |
1612 | pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) { | 1612 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) { |
1613 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); | 1613 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
1614 | pci_disable_device(pci); | 1614 | pci_disable_device(pci); |
1615 | return -ENXIO; | 1615 | return -ENXIO; |
@@ -1673,18 +1673,22 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id) | |||
1673 | 1673 | ||
1674 | status = inb(SLIO_REG(chip, IRQCONTROL)); | 1674 | status = inb(SLIO_REG(chip, IRQCONTROL)); |
1675 | #if 0 | 1675 | #if 0 |
1676 | printk("Es1938debug - interrupt status: =0x%x\n", status); | 1676 | printk(KERN_DEBUG "Es1938debug - interrupt status: =0x%x\n", status); |
1677 | #endif | 1677 | #endif |
1678 | 1678 | ||
1679 | /* AUDIO 1 */ | 1679 | /* AUDIO 1 */ |
1680 | if (status & 0x10) { | 1680 | if (status & 0x10) { |
1681 | #if 0 | 1681 | #if 0 |
1682 | printk("Es1938debug - AUDIO channel 1 interrupt\n"); | 1682 | printk(KERN_DEBUG |
1683 | printk("Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n", | 1683 | "Es1938debug - AUDIO channel 1 interrupt\n"); |
1684 | printk(KERN_DEBUG | ||
1685 | "Es1938debug - AUDIO channel 1 DMAC DMA count: %u\n", | ||
1684 | inw(SLDM_REG(chip, DMACOUNT))); | 1686 | inw(SLDM_REG(chip, DMACOUNT))); |
1685 | printk("Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n", | 1687 | printk(KERN_DEBUG |
1688 | "Es1938debug - AUDIO channel 1 DMAC DMA base: %u\n", | ||
1686 | inl(SLDM_REG(chip, DMAADDR))); | 1689 | inl(SLDM_REG(chip, DMAADDR))); |
1687 | printk("Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n", | 1690 | printk(KERN_DEBUG |
1691 | "Es1938debug - AUDIO channel 1 DMAC DMA status: 0x%x\n", | ||
1688 | inl(SLDM_REG(chip, DMASTATUS))); | 1692 | inl(SLDM_REG(chip, DMASTATUS))); |
1689 | #endif | 1693 | #endif |
1690 | /* clear irq */ | 1694 | /* clear irq */ |
@@ -1699,10 +1703,13 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id) | |||
1699 | /* AUDIO 2 */ | 1703 | /* AUDIO 2 */ |
1700 | if (status & 0x20) { | 1704 | if (status & 0x20) { |
1701 | #if 0 | 1705 | #if 0 |
1702 | printk("Es1938debug - AUDIO channel 2 interrupt\n"); | 1706 | printk(KERN_DEBUG |
1703 | printk("Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n", | 1707 | "Es1938debug - AUDIO channel 2 interrupt\n"); |
1708 | printk(KERN_DEBUG | ||
1709 | "Es1938debug - AUDIO channel 2 DMAC DMA count: %u\n", | ||
1704 | inw(SLIO_REG(chip, AUDIO2DMACOUNT))); | 1710 | inw(SLIO_REG(chip, AUDIO2DMACOUNT))); |
1705 | printk("Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n", | 1711 | printk(KERN_DEBUG |
1712 | "Es1938debug - AUDIO channel 2 DMAC DMA base: %u\n", | ||
1706 | inl(SLIO_REG(chip, AUDIO2DMAADDR))); | 1713 | inl(SLIO_REG(chip, AUDIO2DMAADDR))); |
1707 | 1714 | ||
1708 | #endif | 1715 | #endif |