From 0c1f6c21c983d2eaaa8890ddbed4e1274b91855c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 10 May 2007 16:56:09 +0200 Subject: [PATCH] --- yaml --- r: 56491 b: refs/heads/master c: b75e53f09212f12369156710e84d1cbf115113cd h: refs/heads/master i: 56489: 17e1da36051d34dad451fd2f8f03f2f5dfbbf9cb 56487: e1b7bdaccb3465ae2cbc2203d5decfb56a8ee603 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 51c7564a9c3d..202b4308722c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d417045e7deeb37d97793805fe302da7b4f82eec +refs/heads/master: b75e53f09212f12369156710e84d1cbf115113cd diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 14649d54b493..8e89d56b6400 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -707,7 +707,8 @@ static u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction) direction == HDA_OUTPUT ? AC_PAR_AMP_OUT_CAP : AC_PAR_AMP_IN_CAP); - info->status |= INFO_AMP_CAPS; + if (info->amp_caps) + info->status |= INFO_AMP_CAPS; } return info->amp_caps; }