diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:00:16 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:00:16 +0200 |
commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/pci/sis7019.c | |
parent | ASoC: TWL4030: Fix gain control for earpiece amplifier (diff) | |
parent | ALSA: pcm core - Avoid jiffies check for devices with BATCH flag (diff) | |
download | linux-3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026.tar.xz linux-3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026.zip |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/pci/sis7019.c')
-rw-r--r-- | sound/pci/sis7019.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index baf6d8e3dabc..1a5ff0611072 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c @@ -1300,7 +1300,7 @@ static int __devinit sis_chip_create(struct snd_card *card, if (rc) goto error_out; - if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0) { + if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0) { printk(KERN_ERR "sis7019: architecture does not support " "30-bit PCI busmaster DMA"); goto error_out_enabled; |