diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-15 17:48:35 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-15 17:51:56 +0200 |
| commit | fcad94a4c71c36a05f4d5c6dcb174534b4e0b136 (patch) | |
| tree | b37bea214d8159123c0b7e398e635a4b8aa9a2a6 /sound | |
| parent | 83b2086ce2a1458168dc8b9d624060b2d7a82d4c (diff) | |
| download | op-kernel-dev-fcad94a4c71c36a05f4d5c6dcb174534b4e0b136.zip op-kernel-dev-fcad94a4c71c36a05f4d5c6dcb174534b4e0b136.tar.gz | |
ALSA: hda - Fix the cmd cache keys for amp verbs
Fix the key value generation for get/set amp verbs. The upper bits of
the parameter have to be combined with the verb value to be unique for
each direction/index of amp access.
This fixes the resume problem on some hardwares like Macbook after
the channel mode is changed.
Tested-by: Johannes Berg <johannes@sipsolutions.net>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 a4e5e59..fd6e6f3 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; |
