]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: ice1724/revo: simple clean up
authorAlexander Beregalov <a.beregalov@gmail.com>
Sun, 10 Aug 2008 22:09:04 +0000 (02:09 +0400)
committerJaroslav Kysela <perex@perex.cz>
Wed, 13 Aug 2008 09:46:45 +0000 (11:46 +0200)
ice1724/revo: simple clean up

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
sound/pci/ice1712/revo.c

index 4d2631434dc81bdb83720ea717c1d6a613fdc51d..5e1b156bfaa7248fa9f302184480a604e951dfb5 100644 (file)
@@ -524,16 +524,20 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
        ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
        if (! ak)
                return -ENOMEM;
-       ice->akm_codecs = 2;
        switch (ice->eeprom.subvendor) {
        case VT1724_SUBDEVICE_REVOLUTION71:
                ice->akm_codecs = 2;
-               if ((err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front, &akm_revo_front_priv, ice)) < 0)
+               err = snd_ice1712_akm4xxx_init(ak, &akm_revo_front,
+                                               &akm_revo_front_priv, ice);
+               if (err < 0)
                        return err;
-               if ((err = snd_ice1712_akm4xxx_init(ak + 1, &akm_revo_surround, &akm_revo_surround_priv, ice)) < 0)
+               err = snd_ice1712_akm4xxx_init(ak+1, &akm_revo_surround,
+                                               &akm_revo_surround_priv, ice);
+               if (err < 0)
                        return err;
                /* unmute all codecs */
-               snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE, VT1724_REVO_MUTE);
+               snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE,
+                                               VT1724_REVO_MUTE);
                break;
        case VT1724_SUBDEVICE_REVOLUTION51:
                ice->akm_codecs = 2;