summaryrefslogtreecommitdiff
path: root/sound/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-06-10 08:27:00 (GMT)
committerTakashi Iwai <tiwai@suse.de>2015-06-10 08:31:10 (GMT)
commit98a226ed21949601b270f7ea20abc9f72f7b0be9 (patch)
tree44f4f94a3a0f9609b74c7e1c6b3b92a9a60a3fb9 /sound/hda
parent132bd96bc56f9cafd24b71de389984d0e83a0956 (diff)
downloadlinux-98a226ed21949601b270f7ea20abc9f72f7b0be9.tar.xz
ALSA: hda - Don't actually write registers for caps overwrites
Along with the transition to regmap for managing the cached parameter reads, the caps overwrite was also moved to regmap cache. The cache change itself works, but it still tries to write the non-existing verb (the HDA parameter is read-only) wrongly. It's harmless in most cases, but some chips are picky and may result in the codec communication stall. This patch avoids it just by adding the missing flag check in reg_write ops. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda')
-rw-r--r--sound/hda/hdac_regmap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c
index 7371e0c..c4f5e61 100644
--- a/sound/hda/hdac_regmap.c
+++ b/sound/hda/hdac_regmap.c
@@ -265,6 +265,9 @@ static int hda_reg_write(void *context, unsigned int reg, unsigned int val)
unsigned int verb;
int i, bytes, err;
+ if (codec->caps_overwriting)
+ return 0;
+
reg &= ~0x00080000U; /* drop GET bit */
reg |= (codec->addr << 28);
verb = get_verb(reg);