diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-27 16:42:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-27 16:42:45 +0200 |
| commit | f1a77547c21fe942e95ebaadbc9200f26d138574 (patch) | |
| tree | 3b217b2827e30c840f0747d2cfb861baa656a417 /sound/pci/ctxfi/cthw20k2.c | |
| parent | 30e5f003ff4b2be86f71733b6c9b11355d66584c (diff) | |
| parent | 8ab418d3651b14d38498d868617a7280ccc6de08 (diff) | |
| download | linux-f1a77547c21fe942e95ebaadbc9200f26d138574.tar.gz linux-f1a77547c21fe942e95ebaadbc9200f26d138574.tar.bz2 linux-f1a77547c21fe942e95ebaadbc9200f26d138574.zip | |
Merge branch 'for-4.2' into for-next
Diffstat (limited to 'sound/pci/ctxfi/cthw20k2.c')
| -rw-r--r-- | sound/pci/ctxfi/cthw20k2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c index 955ad871e9a8..9dc2950e1ab7 100644 --- a/sound/pci/ctxfi/cthw20k2.c +++ b/sound/pci/ctxfi/cthw20k2.c @@ -2035,8 +2035,8 @@ static int hw_card_start(struct hw *hw) return err; /* Set DMA transfer mask */ - if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || - pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { + if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 || + dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) { dev_err(hw->card->dev, "architecture does not support PCI busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK); |