diff options
author | David S. Miller <davem@davemloft.net> | 2016-04-27 15:43:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-27 15:43:10 -0400 |
commit | c0cc53162a0644dd57dce5e2fbb9bbafdc57d183 (patch) | |
tree | 02393c85628c6ec7d0d942e880623b7f37cf3460 /sound/hda/hdac_device.c | |
parent | 8c14586fc320acfed8a0048eb21d1f2e2856fc36 (diff) | |
parent | f28f20da704d399fb1e4d8838ffd697a357d9cc8 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in the conflicts.
In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/hda/hdac_device.c')
-rw-r--r-- | sound/hda/hdac_device.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index d1a4d6973330..03c9872c31cf 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -299,13 +299,11 @@ EXPORT_SYMBOL_GPL(_snd_hdac_read_parm); int snd_hdac_read_parm_uncached(struct hdac_device *codec, hda_nid_t nid, int parm) { - int val; + unsigned int cmd, val; - if (codec->regmap) - regcache_cache_bypass(codec->regmap, true); - val = snd_hdac_read_parm(codec, nid, parm); - if (codec->regmap) - regcache_cache_bypass(codec->regmap, false); + cmd = snd_hdac_regmap_encode_verb(nid, AC_VERB_PARAMETERS) | parm; + if (snd_hdac_regmap_read_raw_uncached(codec, cmd, &val) < 0) + return -1; return val; } EXPORT_SYMBOL_GPL(snd_hdac_read_parm_uncached); |