diff options
| author | Alexander Beregalov <a.beregalov@gmail.com> | 2008-08-11 02:09:04 +0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-13 11:46:45 +0200 |
| commit | faa09c932c5e1daf5fa40a0ff3d895ad57c5a61d (patch) | |
| tree | beff203e50c6e76a0d7e198cb7cf584040988b3d /sound/pci/ice1712 | |
| parent | bdbecf50064b75ecce2e10ce2621de0d0fac7de6 (diff) | |
| download | kernel_goldelico_gta04-faa09c932c5e1daf5fa40a0ff3d895ad57c5a61d.zip kernel_goldelico_gta04-faa09c932c5e1daf5fa40a0ff3d895ad57c5a61d.tar.gz kernel_goldelico_gta04-faa09c932c5e1daf5fa40a0ff3d895ad57c5a61d.tar.bz2 | |
ALSA: ice1724/revo: simple clean up
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>
Diffstat (limited to 'sound/pci/ice1712')
| -rw-r--r-- | sound/pci/ice1712/revo.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c index 4d26314..5e1b156 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) 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; |