diff options
author | Takashi Iwai <tiwai@suse.de> | 2020-12-14 09:05:24 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-12-14 09:05:29 +0100 |
commit | e5fab13a7c54b8e69ea3bb27067eb06aba5f19b5 (patch) | |
tree | 32ee15f944c907b7442da9d124efba8e67c7ece6 /sound/soc/codecs | |
parent | ALSA: hda/ca0132 - Add ZxR surround DAC setup. (diff) | |
parent | ALSA: usb-audio: Fix control 'access overflow' errors from chmap (diff) | |
download | linux-dev-e5fab13a7c54b8e69ea3bb27067eb06aba5f19b5.tar.xz linux-dev-e5fab13a7c54b8e69ea3bb27067eb06aba5f19b5.zip |
Merge branch 'for-linus' into for-next
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/rt5682.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/wm_adsp.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index a9acce7b6cca..d9878173ff89 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -43,6 +43,7 @@ static const struct reg_sequence patch_list[] = { {RT5682_DAC_ADC_DIG_VOL1, 0xa020}, {RT5682_I2C_CTRL, 0x000f}, {RT5682_PLL2_INTERNAL, 0x8266}, + {RT5682_SAR_IL_CMD_3, 0x8365}, }; void rt5682_apply_patch_list(struct rt5682_priv *rt5682, struct device *dev) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index bcf18bf15a02..e61d00486c65 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1937,6 +1937,7 @@ static int wm_adsp_load(struct wm_adsp *dsp) mem = wm_adsp_find_region(dsp, type); if (!mem) { adsp_err(dsp, "No region of type: %x\n", type); + ret = -EINVAL; goto out_fw; } |