From 8012108790f89e0a2bd121ddb3d96b96a727e305 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 6 Jul 2009 15:01:09 +0200 Subject: [PATCH] --- yaml --- r: 157826 b: refs/heads/master c: 60e53882ace216cf58fc847a94d839f32b8eb7bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_cirrus.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d636d5a596b5..3b64afc707b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40c20fa05a29766565f56ede17d0ffa539e1c9a9 +refs/heads/master: 60e53882ace216cf58fc847a94d839f32b8eb7bf diff --git a/trunk/sound/pci/hda/patch_cirrus.c b/trunk/sound/pci/hda/patch_cirrus.c index 2187383cdfd6..404c120991bf 100644 --- a/trunk/sound/pci/hda/patch_cirrus.c +++ b/trunk/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; } /*