diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-06 15:01:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-06 15:01:09 +0200 |
| commit | 60e53882ace216cf58fc847a94d839f32b8eb7bf (patch) | |
| tree | f20c2c9fce41a2159927e76a4ab1a0c158cffba8 /sound | |
| parent | ALSA: hda - Add CS420x-specific coef setup (diff) | |
| download | linux-60e53882ace216cf58fc847a94d839f32b8eb7bf.tar.xz linux-60e53882ace216cf58fc847a94d839f32b8eb7bf.zip | |
ALSA: hda - Fix double creation of SPDIF input controls
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -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) 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; } /* |