diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
| commit | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch) | |
| tree | beba3ecc27c64e0c22b1a21201f1999afe9834f2 /sound/pci/hda/hda_codec.c | |
| parent | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff) | |
| parent | b2cd64153b94473f6bd82448a68b8e8c041676ea (diff) | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 14649d54b49..8e89d56b640 100644 --- a/sound/pci/hda/hda_codec.c +++ b/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; } |