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

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

[PATCH] sound/oss/esssolo1: 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 f90e7185

sound/oss/esssolo1.c

+2 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
#include <linux/smp_lock.h>

#include <linux/gameport.h>

#include <linux/wait.h>

#include <linux/dma-mapping.h>



#include <asm/io.h>

#include <asm/page.h>
@@ -2326,7 +2327,7 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device 
	 * to 24 bits first, then 32 bits (playback only) if that fails.

	 */

	if (pci_set_dma_mask(pcidev, 0x00ffffff) &&

	    pci_set_dma_mask(pcidev, 0xffffffff)) {

	    pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {

		printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n");

		return -ENODEV;

	}