diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-15 17:52:32 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-15 17:52:32 +0200 |
| commit | 9dd175f7d2db1826c891855d3d150da3a5792e94 (patch) | |
| tree | c5b843acc595c15a31528a7ec1e2ea402c427bc8 /sound | |
| parent | f4723b224d21ff546ac1fea4483094548d529479 (diff) | |
| parent | fcad94a4c71c36a05f4d5c6dcb174534b4e0b136 (diff) | |
| download | linux-3.10-9dd175f7d2db1826c891855d3d150da3a5792e94.tar.gz linux-3.10-9dd175f7d2db1826c891855d3d150da3a5792e94.tar.bz2 linux-3.10-9dd175f7d2db1826c891855d3d150da3a5792e94.zip | |
Merge branch 'topic/hda' into for-linus
* topic/hda:
ALSA: hda - Fix the cmd cache keys for amp verbs
ALSA: add missing definitions(letters) to HD-Audio.txt
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index a4e5e595211..fd6e6f337d1 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2250,7 +2250,11 @@ int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid, err = bus->ops.command(bus, res); if (!err) { struct hda_cache_head *c; - u32 key = build_cmd_cache_key(nid, verb); + u32 key; + /* parm may contain the verb stuff for get/set amp */ + verb = verb | (parm >> 8); + parm &= 0xff; + key = build_cmd_cache_key(nid, verb); c = get_alloc_hash(&codec->cmd_cache, key); if (c) c->val = parm; |