aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-05 06:15:51 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-05 06:18:37 -0400
commit6bc5874a1ddf98ac0fe6c4eab7d286c11cb1c748 (patch)
tree20b643c0b001df43732c4725f2f4221c8145578b /sound
parent42a0b31827e4c555efebda7d347cf4ea6b82913a (diff)
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>
Diffstat (limited to 'sound')
-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)
1883 int err = 0; 1883 int err = 0;
1884 struct pci_dev *pci = hw->pci; 1884 struct pci_dev *pci = hw->pci;
1885 u16 subsys_id = 0; 1885 u16 subsys_id = 0;
1886 unsigned int dma_mask = 0;
1887 1886
1888 err = pci_enable_device(pci); 1887 err = pci_enable_device(pci);
1889 if (err < 0) 1888 if (err < 0)
1890 return err; 1889 return err;
1891 1890
1892 /* Set DMA transfer mask */ 1891 /* Set DMA transfer mask */
1893 dma_mask = CT_XFI_DMA_MASK; 1892 if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
1894 if (pci_set_dma_mask(pci, dma_mask) < 0 || 1893 pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
1895 pci_set_consistent_dma_mask(pci, dma_mask) < 0) {
1896 printk(KERN_ERR "architecture does not support PCI " 1894 printk(KERN_ERR "architecture does not support PCI "
1897 "busmaster DMA with mask 0x%x\n", dma_mask); 1895 "busmaster DMA with mask 0x%llx\n",
1896 CT_XFI_DMA_MASK);
1898 err = -ENXIO; 1897 err = -ENXIO;
1899 goto error1; 1898 goto error1;
1900 } 1899 }