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 | |
| 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
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio.txt | 4 | ||||
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt index c5948f2f9a2..88b7433d2f1 100644 --- a/Documentation/sound/alsa/HD-Audio.txt +++ b/Documentation/sound/alsa/HD-Audio.txt @@ -169,7 +169,7 @@ PCI SSID look-up. What `model` option values are available depends on the codec chip. Check your codec chip from the codec proc file (see "Codec Proc-File" section below). It will show the vendor/product name of your codec -chip. Then, see Documentation/sound/alsa/HD-Audio-Modelstxt file, +chip. Then, see Documentation/sound/alsa/HD-Audio-Models.txt file, the section of HD-audio driver. You can find a list of codecs and `model` options belonging to each codec. For example, for Realtek ALC262 codec chip, pass `model=ultra` for devices that are compatible @@ -177,7 +177,7 @@ with Samsung Q1 Ultra. Thus, the first thing you can do for any brand-new, unsupported and non-working HD-audio hardware is to check HD-audio codec and several -different `model` option values. If you have a luck, some of them +different `model` option values. If you have any luck, some of them might suit with your device well. Some codecs such as ALC880 have a special model option `model=test`. 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; |