diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/pci/maestro3.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/pci/maestro3.c')
| -rw-r--r-- | sound/pci/maestro3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 70141548f251..75283fbb4b3f 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
| @@ -2530,8 +2530,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, | |||
| 2530 | return -EIO; | 2530 | return -EIO; |
| 2531 | 2531 | ||
| 2532 | /* check, if we can restrict PCI DMA transfers to 28 bits */ | 2532 | /* check, if we can restrict PCI DMA transfers to 28 bits */ |
| 2533 | if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || | 2533 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || |
| 2534 | pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { | 2534 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { |
| 2535 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); | 2535 | snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); |
| 2536 | pci_disable_device(pci); | 2536 | pci_disable_device(pci); |
| 2537 | return -ENXIO; | 2537 | return -ENXIO; |