aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_cirrus.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-07-06 15:01:09 +0200
committerTakashi Iwai <tiwai@suse.de>2009-07-06 15:01:09 +0200
commit60e53882ace216cf58fc847a94d839f32b8eb7bf (patch)
treef20c2c9fce41a2159927e76a4ab1a0c158cffba8 /sound/pci/hda/patch_cirrus.c
parent40c20fa05a29766565f56ede17d0ffa539e1c9a9 (diff)
downloadmrst-s0i3-test-60e53882ace216cf58fc847a94d839f32b8eb7bf.tar.gz
mrst-s0i3-test-60e53882ace216cf58fc847a94d839f32b8eb7bf.tar.xz
mrst-s0i3-test-60e53882ace216cf58fc847a94d839f32b8eb7bf.zip
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.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 2187383cdfd..404c120991b 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;
}
/*