From: Takashi Iwai Date: Mon, 6 Jul 2009 13:01:09 +0000 (+0200) Subject: ALSA: hda - Fix double creation of SPDIF input controls X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=60e53882ace216cf58fc847a94d839f32b8eb7bf;p=deliverable%2Flinux.git ALSA: hda - Fix double creation of SPDIF input controls Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 2187383cdfd6..404c120991bf 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -471,12 +471,9 @@ static int parse_digital_input(struct hda_codec *codec) struct auto_pin_cfg *cfg = &spec->autocfg; int idx; - if (!cfg->dig_in_pin) - return 0; - spec->dig_in = get_adc(codec, cfg->dig_in_pin, &idx); - if (!spec->dig_in) - return 0; - return snd_hda_create_spdif_in_ctls(codec, spec->dig_in); + if (cfg->dig_in_pin) + spec->dig_in = get_adc(codec, cfg->dig_in_pin, &idx); + return 0; } /*