Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3421
b: refs/heads/master
c: 738c7b4
h: refs/heads/master
i:
  3419: d4fae47
v: v3
  • Loading branch information
Tobias Klauser authored and Linus Torvalds committed Jun 25, 2005
1 parent 91c6760 commit b672c2f
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: 3ee538a2e867c7fbdb2a5940b610682d5d08e8be
refs/heads/master: 738c7b4f7f36ce2c547d0a2c2aa397aae904510f
3 changes: 2 additions & 1 deletion trunk/sound/oss/es1370.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
#include <linux/spinlock.h>
#include <linux/gameport.h>
#include <linux/wait.h>
#include <linux/dma-mapping.h>

#include <asm/io.h>
#include <asm/page.h>
Expand Down Expand Up @@ -2569,7 +2570,7 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic
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 "es1370: architecture does not support 32bit PCI busmaster DMA\n");
return i;
Expand Down

0 comments on commit b672c2f

Please sign in to comment.