Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faa09c93 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Jaroslav Kysela
Browse files

ALSA: ice1724/revo: simple clean up 



ice1724/revo: simple clean up

Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent bdbecf50

sound/pci/ice1712/revo.c

+8 −4
Original line number Diff line number Diff line
@@ -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;