Gitweb: http://git.kernel.org/linus/4836ac655410e7f126d316b0be062b38746f7529
Commit: 4836ac655410e7f126d316b0be062b38746f7529
Parent: d436dd063be605dc29f17b2cb0b99a852db89bed
Author: Takashi Iwai <tiwai@suse.de>
AuthorDate: Mon Jun 8 14:49:26 2009 +0200
Committer: Takashi Iwai <tiwai@suse.de>
CommitDate: Mon Jun 8 14:51:24 2009 +0200
ALSA: ctxfi - Fix DMA mask for emu20k2 chip
Allow 64bit DMA mask for emu20k2 chip, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/ctxfi/cthw20k2.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index 041199f..edbfb48 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -26,7 +26,11 @@
#include <linux/interrupt.h>
#include <linux/delay.h>
-#define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bits */
+#if BITS_PER_LONG == 32
+#define CT_XFI_DMA_MASK DMA_BIT_MASK(32) /* 32 bit PTE */
+#else
+#define CT_XFI_DMA_MASK DMA_BIT_MASK(64) /* 64 bit PTE */
+#endif
static u32 hw_read_20kx(struct hw *hw, u32 reg);
static void hw_write_20kx(struct hw *hw, u32 reg, u32 data);
@@ -1834,18 +1838,16 @@ static int hw_card_start(struct hw *hw)
int err = 0;
struct pci_dev *pci = hw->pci;
unsigned int gctl;
- unsigned int dma_mask = 0;
err = pci_enable_device(pci);
if (err < 0)
return err;
/* Set DMA transfer mask */
- dma_mask = CT_XFI_DMA_MASK;
- if (pci_set_dma_mask(pci, dma_mask) < 0 ||
- pci_set_consistent_dma_mask(pci, dma_mask) < 0) {
+ if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
+ pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
printk(KERN_ERR "ctxfi: architecture does not support PCI "
- "busmaster DMA with mask 0x%x\n", dma_mask);
+ "busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK);
err = -ENXIO;
goto error1;
}
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
