tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Takashi Iwai 6bc5874a 42a0b318

+4 -5
+4 -5
sound/pci/ctxfi/cthw20k1.c
··· 1883 1883 int err = 0; 1884 1884 struct pci_dev *pci = hw->pci; 1885 1885 u16 subsys_id = 0; 1886 - unsigned int dma_mask = 0; 1887 1886 1888 1887 err = pci_enable_device(pci); 1889 1888 if (err < 0) 1890 1889 return err; 1891 1890 1892 1891 /* Set DMA transfer mask */ 1893 - dma_mask = CT_XFI_DMA_MASK; 1894 - if (pci_set_dma_mask(pci, dma_mask) < 0 || 1895 - pci_set_consistent_dma_mask(pci, dma_mask) < 0) { 1892 + if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || 1893 + pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { 1896 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 1897 err = -ENXIO; 1899 1898 goto error1; 1900 1899 }