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

Commit 299676b1 authored by Tobias Klauser's avatar Tobias Klauser Committed by Jaroslav Kysela
Browse files

[ALSA] sound/pci/ca0106: Use the DMA_32BIT_MASK constant 

CA0106 driver
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 avatarJaroslav Kysela <perex@suse.cz>
parent 83a5b72a

sound/pci/ca0106/ca0106_main.c

+3 −2
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ 
#include <linux/pci.h>

#include <linux/slab.h>

#include <linux/moduleparam.h>

#include <linux/dma-mapping.h>

#include <sound/core.h>

#include <sound/initval.h>

#include <sound/pcm.h>
@@ -1132,8 +1133,8 @@ static int __devinit snd_ca0106_create(snd_card_t *card, 
  

	if ((err = pci_enable_device(pci)) < 0)

		return err;

	if (pci_set_dma_mask(pci, 0xffffffffUL) < 0 ||

	    pci_set_consistent_dma_mask(pci, 0xffffffffUL) < 0) {

	if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||

	    pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {

		printk(KERN_ERR "error to set 32bit mask DMA\n");

		pci_disable_device(pci);

		return -ENXIO;