aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerton Ronaldo Krzesinski <herton@mandriva.com.br>2009-02-11 17:33:15 -0500
committerTakashi Iwai <tiwai@suse.de>2009-02-11 18:17:31 -0500
commitc98041f7d71890ac6aa2257d78ef175db44d2cd3 (patch)
tree67f5914b72180212e9648d62b254a152975f1d1d
parenta1152e3570e271dbf217391d549d3e47e258fe05 (diff)
ALSA: hda - Cleanup setting of pin_configs in patch_stac927x
After commit "ALSA: hda - Fix restore of pin configs at resume for STAC/IDT codecs", the introduced stac_save_pin_cfgs function checks already for pins == NULL case, saving then default pin configs from machine with stac92xx_save_bios_config_regs. So we can remove the extra checks when stac927x_brd_tbl[spec->board_config] == NULL. Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_sigmatel.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 1882c5735879..3c84817ccd2e 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -5292,10 +5292,9 @@ static int patch_stac927x(struct hda_codec *codec)
5292 stac927x_models, 5292 stac927x_models,
5293 stac927x_cfg_tbl); 5293 stac927x_cfg_tbl);
5294 again: 5294 again:
5295 if (spec->board_config < 0 || !stac927x_brd_tbl[spec->board_config]) { 5295 if (spec->board_config < 0) {
5296 if (spec->board_config < 0) 5296 snd_printdd(KERN_INFO "hda_codec: Unknown model for"
5297 snd_printdd(KERN_INFO "hda_codec: Unknown model for" 5297 "STAC927x, using BIOS defaults\n");
5298 "STAC927x, using BIOS defaults\n");
5299 err = stac92xx_save_bios_config_regs(codec); 5298 err = stac92xx_save_bios_config_regs(codec);
5300 } else 5299 } else
5301 err = stac_save_pin_cfgs(codec, 5300 err = stac_save_pin_cfgs(codec,