diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-07-06 09:01:09 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-07-06 09:01:09 -0400 |
commit | 60e53882ace216cf58fc847a94d839f32b8eb7bf (patch) | |
tree | f20c2c9fce41a2159927e76a4ab1a0c158cffba8 /sound/pci/hda/patch_cirrus.c | |
parent | 40c20fa05a29766565f56ede17d0ffa539e1c9a9 (diff) |
ALSA: hda - Fix double creation of SPDIF input controls
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 9 |
1 files changed, 3 insertions, 6 deletions
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) | |||
471 | struct auto_pin_cfg *cfg = &spec->autocfg; | 471 | struct auto_pin_cfg *cfg = &spec->autocfg; |
472 | int idx; | 472 | int idx; |
473 | 473 | ||
474 | if (!cfg->dig_in_pin) | 474 | if (cfg->dig_in_pin) |
475 | return 0; | 475 | spec->dig_in = get_adc(codec, cfg->dig_in_pin, &idx); |
476 | spec->dig_in = get_adc(codec, cfg->dig_in_pin, &idx); | 476 | return 0; |
477 | if (!spec->dig_in) | ||
478 | return 0; | ||
479 | return snd_hda_create_spdif_in_ctls(codec, spec->dig_in); | ||
480 | } | 477 | } |
481 | 478 | ||
482 | /* | 479 | /* |