vserver 1.9.3

[linux-2.6.git] / sound / pci / ice1712 / revo.c

diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index 5c171ae..82db619 100644 (file)
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -128,7 +128,7 @@ static int __devinit revo_init(ice1712_t *ice)
        switch (ice->eeprom.subvendor) {
        case VT1724_SUBDEVICE_REVOLUTION71:
                ice->num_total_dacs = 8;
-               ice->num_total_adcs = 4;
+               ice->num_total_adcs = 2;
                break;
        default:
                snd_BUG();
@@ -136,7 +136,7 @@ static int __devinit revo_init(ice1712_t *ice)
        }
 
        /* second stage of initialization, analog parts and others */
-       ak = ice->akm = snd_kcalloc(sizeof(akm4xxx_t) * 2, GFP_KERNEL);
+       ak = ice->akm = kcalloc(2, sizeof(akm4xxx_t), GFP_KERNEL);
        if (! ak)
                return -ENOMEM;
        ice->akm_codecs = 2;
@@ -171,10 +171,11 @@ static int __devinit revo_add_controls(ice1712_t *ice)
 /* entry point */
 struct snd_ice1712_card_info snd_vt1724_revo_cards[] __devinitdata = {
        {
-               VT1724_SUBDEVICE_REVOLUTION71,
-               "M Audio Revolution-7.1",
-               revo_init,
-               revo_add_controls,
+               .subvendor = VT1724_SUBDEVICE_REVOLUTION71,
+               .name = "M Audio Revolution-7.1",
+               .model = "revo71",
+               .chip_init = revo_init,
+               .build_controls = revo_add_controls,
        },
        { } /* terminator */
 };