aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/pci/ice1712/revo.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index 4d2631434dc8..5e1b156bfaa7 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -524,16 +524,20 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
524 ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL); 524 ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
525 if (! ak) 525 if (! ak)
526 return -ENOMEM; 526 return -ENOMEM;
527 ice->akm_codecs = 2;
528 switch (ice->eeprom.subvendor) { 527 switch (ice->eeprom.subvendor) {
529 case VT1724_SUBDEVICE_REVOLUTION71: 528 case VT1724_SUBDEVICE_REVOLUTION71:
530 ice->akm_codecs = 2; 529 ice->akm_codecs = 2;
531 if ((err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front, &akm_revo_front_priv, ice)) < 0) 530 err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front,
531 &akm_revo_front_priv, ice);
532 if (err < 0)
532 return err; 533 return err;
533 if ((err = snd_ice1712_akm4xxx_init(ak + 1, &akm_revo_surround, &akm_revo_surround_priv, ice)) < 0) 534 err = snd_ice1712_akm4xxx_init(ak+1, &akm_revo_surround,
535 &akm_revo_surround_priv, ice);
536 if (err < 0)
534 return err; 537 return err;
535 /* unmute all codecs */ 538 /* unmute all codecs */
536 snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE, VT1724_REVO_MUTE); 539 snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE,
540 VT1724_REVO_MUTE);
537 break; 541 break;
538 case VT1724_SUBDEVICE_REVOLUTION51: 542 case VT1724_SUBDEVICE_REVOLUTION51:
539 ice->akm_codecs = 2; 543 ice->akm_codecs = 2;