Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 738c7b4f authored by Tobias Klauser's avatar Tobias Klauser Committed by Linus Torvalds
Browse files

[PATCH] sound/oss/es1370: Use the DMA_32BIT_MASK constant 

Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2

 for details

Signed-off-by: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3ee538a2

sound/oss/es1370.c

+2 −1
Original line number Diff line number Diff line
@@ -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>
@@ -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;