| commit | 112b9678080f7dee26bf4e653d76be7416d27086 | [log] [tgz] |
|---|---|---|
| author | xj <xj@example.com> | Tue Jan 25 16:13:48 2022 +0800 |
| committer | xj <xj@example.com> | Tue Jan 25 16:13:48 2022 +0800 |
| tree | a885aa1ddeca4caa75f5f3e14c199194f84c9f37 | |
| parent | a9508a13784598860accc804d0bcc76f2f461aaf [diff] |
[Feature] Merge MR0.5 from MTK Change-Id: I77f817d2d58dfa7a69b4af32123f2929c724356e
diff --git a/src/kernel/linux/v4.19/sound/soc/codecs/nau8810.c b/src/kernel/linux/v4.19/sound/soc/codecs/nau8810.c index 7382b0d..58ad3bc 100644 --- a/src/kernel/linux/v4.19/sound/soc/codecs/nau8810.c +++ b/src/kernel/linux/v4.19/sound/soc/codecs/nau8810.c
@@ -885,7 +885,7 @@ if(regmap_write(nau8810->regmap,NAU8810_REG_IFACE,0x0050)) { printk("Not find nau8810 codec!\n"); - return -ENXIO;//liulei + //return -ENXIO; } printk("Find nau8810 codec!\n"); nau8810_set_nau8810_config(nau8810->regmap);
diff --git a/src/kernel/linux/v4.19/sound/soc/codecs/tlv320aic3x.c b/src/kernel/linux/v4.19/sound/soc/codecs/tlv320aic3x.c index 18aa478..d1c2d9b 100644 --- a/src/kernel/linux/v4.19/sound/soc/codecs/tlv320aic3x.c +++ b/src/kernel/linux/v4.19/sound/soc/codecs/tlv320aic3x.c
@@ -1909,7 +1909,7 @@ if((ret = regmap_write(aic3x->regmap,1,0x0))) { printk("Not find tlv320aic3104 codec!\n"); - //goto err_gpio;//liulei + goto err_gpio; } printk("Find tlv320aic3104 codec!\n"); regcache_cache_only(aic3x->regmap, true);