Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3422
b: refs/heads/master
c: 4f11842
h: refs/heads/master
v: v3
  • Loading branch information
Tobias Klauser authored and Linus Torvalds committed Jun 25, 2005
1 parent b672c2f commit fd606f4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 738c7b4f7f36ce2c547d0a2c2aa397aae904510f
refs/heads/master: 4f11842ebbb3b98a88c38ef6c18345ccc792a54b
3 changes: 2 additions & 1 deletion trunk/sound/oss/cmpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
#include <linux/smp_lock.h>
#include <linux/bitops.h>
#include <linux/wait.h>
#include <linux/dma-mapping.h>

#include <asm/io.h>
#include <asm/page.h>
Expand Down Expand Up @@ -3058,7 +3059,7 @@ static int __devinit cm_probe(struct pci_dev *pcidev, const struct pci_device_id
return -ENODEV;
if (pcidev->irq == 0)
return -ENODEV;
i = pci_set_dma_mask(pcidev, 0xffffffff);
i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
if (i) {
printk(KERN_WARNING "cmpci: architecture does not support 32bit PCI busmaster DMA\n");
return i;
Expand Down

0 comments on commit fd606f4

Please sign in to comment.