From bacfe38985aa1b3dc66b674a1c79455c5d7a6f20 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 17 May 2011 10:02:27 +0200 Subject: [PATCH] --- yaml --- r: 248483 b: refs/heads/master c: 1682c8174692180fcb19317704a0d32c8731eb33 h: refs/heads/master i: 248481: f5db965295beba92157b3072ea894db62fb53392 248479: 9a1fed0c541d2cef0671d3d27df534b7ef8ca6b4 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_cirrus.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7bb4021a82af..791cf9530ab9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06dec2282b1366136442950958b517db691533a1 +refs/heads/master: 1682c8174692180fcb19317704a0d32c8731eb33 diff --git a/trunk/sound/pci/hda/patch_cirrus.c b/trunk/sound/pci/hda/patch_cirrus.c index 43fd403e9bd3..4ff70c130dab 100644 --- a/trunk/sound/pci/hda/patch_cirrus.c +++ b/trunk/sound/pci/hda/patch_cirrus.c @@ -349,8 +349,7 @@ static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin, hda_nid_t pins[2]; unsigned int type; int j, nums; - type = (get_wcaps(codec, nid) & AC_WCAP_TYPE) - >> AC_WCAP_TYPE_SHIFT; + type = get_wcaps_type(get_wcaps(codec, nid)); if (type != AC_WID_AUD_IN) continue; nums = snd_hda_get_connections(codec, nid, pins,