git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/section-fix' into for-linus
[pandora-kernel.git]
/
sound
/
pci
/
ca0106
/
ca0106_main.c
diff --git
a/sound/pci/ca0106/ca0106_main.c
b/sound/pci/ca0106/ca0106_main.c
index
df75757
..
57b992a
100644
(file)
--- a/
sound/pci/ca0106/ca0106_main.c
+++ b/
sound/pci/ca0106/ca0106_main.c
@@
-1319,7
+1319,6
@@
static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device)
}
pcm->info_flags = 0;
}
pcm->info_flags = 0;
- pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
strcpy(pcm->name, "CA0106");
for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
strcpy(pcm->name, "CA0106");
for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
@@
-1589,8
+1588,8
@@
static int __devinit snd_ca0106_create(int dev, struct snd_card *card,
err = pci_enable_device(pci);
if (err < 0)
return err;
err = pci_enable_device(pci);
if (err < 0)
return err;
- if (pci_set_dma_mask(pci, DMA_
32BIT_MASK
) < 0 ||
- pci_set_consistent_dma_mask(pci, DMA_
32BIT_MASK
) < 0) {
+ if (pci_set_dma_mask(pci, DMA_
BIT_MASK(32)
) < 0 ||
+ pci_set_consistent_dma_mask(pci, DMA_
BIT_MASK(32)
) < 0) {
printk(KERN_ERR "error to set 32bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;
printk(KERN_ERR "error to set 32bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;