diff options
| author | Mark Brown <broonie@kernel.org> | 2024-01-22 19:36:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-01-22 19:36:54 +0000 |
| commit | 5976192d138cb3ef148983d3a0120a1f6001fbab (patch) | |
| tree | da1e1cdde954b54b2bf9d5395107a7238caf7278 /sound/soc/codecs | |
| parent | 395228688d9a1dfb7143947729e12db1f762fa1b (diff) | |
| parent | 70b4769956651e986591dd94b3ff9649122b1513 (diff) | |
| download | linux-stable-5976192d138cb3ef148983d3a0120a1f6001fbab.tar.gz linux-stable-5976192d138cb3ef148983d3a0120a1f6001fbab.tar.bz2 linux-stable-5976192d138cb3ef148983d3a0120a1f6001fbab.zip | |
ASoC: Merge up fixes
To facilitate testing get our current fixes into the branch.
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wcd934x.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wcd938x.c | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index 1b6e376f3833..6813268e6a19 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -13,7 +13,6 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> -#include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/slimbus.h> #include <sound/pcm_params.h> diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index faf8d3f9b3c5..6021aa5a5689 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -210,7 +210,7 @@ struct wcd938x_priv { }; static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(ear_pa_gain, 600, -1800); -static const DECLARE_TLV_DB_SCALE(line_gain, -3000, 150, -3000); +static const DECLARE_TLV_DB_SCALE(line_gain, -3000, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(analog_gain, 0, 3000); struct wcd938x_mbhc_zdet_param { @@ -3587,10 +3587,8 @@ static int wcd938x_probe(struct platform_device *pdev) mutex_init(&wcd938x->micb_lock); ret = wcd938x_populate_dt_data(wcd938x, dev); - if (ret) { - dev_err(dev, "%s: Fail to obtain platform data\n", __func__); - return -EINVAL; - } + if (ret) + return ret; ret = wcd938x_add_slave_components(wcd938x, dev, &match); if (ret) |