summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-05 12:15:51 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-05 12:18:37 +0200
commit6bc5874a1ddf98ac0fe6c4eab7d286c11cb1c748 (patch)
tree20b643c0b001df43732c4725f2f4221c8145578b
parent42a0b31827e4c555efebda7d347cf4ea6b82913a (diff)
downloadblackbird-op-linux-6bc5874a1ddf98ac0fe6c4eab7d286c11cb1c748.tar.gz
blackbird-op-linux-6bc5874a1ddf98ac0fe6c4eab7d286c11cb1c748.zip
ALSA: ctxfi - Fix previous fix for 64bit DMA
Remove unneeded substitution to 32bit int to make it really working. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/ctxfi/cthw20k1.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index fd5f454c4040..e530a6d60422 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1883,18 +1883,17 @@ static int hw_card_start(struct hw *hw)
int err = 0;
struct pci_dev *pci = hw->pci;
u16 subsys_id = 0;
- 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 "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;
}
OpenPOWER on IntegriCloud