Commit e36a6e0b authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] Add a new ID

CA0106 driver
I attach a minor update that corrects the DMA mask, and adds an extra
ID. This sound card can handle 32bit DMA addresses.
Signed-off-by: default avatarJames Courtier-Dutton  <James@superbug.demon.co.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1abef0c0
...@@ -166,6 +166,7 @@ typedef struct { ...@@ -166,6 +166,7 @@ typedef struct {
static ca0106_names_t ca0106_chip_names[] = { static ca0106_names_t ca0106_chip_names[] = {
{ 0x10021102, "AudigyLS [SB0310]"} , { 0x10021102, "AudigyLS [SB0310]"} ,
{ 0x10051102, "AudigyLS [SB0310b]"} , /* Unknown AudigyLS that also says SB0310 on it */
{ 0x10061102, "Live! 7.1 24bit [SB0410]"} , /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */ { 0x10061102, "Live! 7.1 24bit [SB0410]"} , /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
{ 0x10071102, "Live! 7.1 24bit [SB0413]"} , /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97. */ { 0x10071102, "Live! 7.1 24bit [SB0413]"} , /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97. */
{ 0, "AudigyLS [Unknown]" } { 0, "AudigyLS [Unknown]" }
...@@ -995,9 +996,9 @@ static int __devinit snd_ca0106_create(snd_card_t *card, ...@@ -995,9 +996,9 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
if ((err = pci_enable_device(pci)) < 0) if ((err = pci_enable_device(pci)) < 0)
return err; return err;
if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || if (pci_set_dma_mask(pci, 0xffffffffUL) < 0 ||
pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { pci_set_consistent_dma_mask(pci, 0xffffffffUL) < 0) {
printk(KERN_ERR "error to set 28bit mask DMA\n"); printk(KERN_ERR "error to set 32bit mask DMA\n");
pci_disable_device(pci); pci_disable_device(pci);
return -ENXIO; return -ENXIO;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment