xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: rt5663: Handle device_property_read_u32_array error codes

Browse Source 
[ Upstream commit 2167c0b205960607fb136b4bb3c556a62be1569a ]

The return value of device_property_read_u32_array() is not always 0.
To catch the exception in case that devm_kzalloc failed and the
rt5663->imp_table was NULL, which caused the failure of
device_property_read_u32_array.

Fixes: 450f0f6a8f ("ASoC: rt5663: Add the manual offset field to compensate the DC offset")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20211215031550.70702-1-jiasheng@iscas.ac.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jiasheng Jiang
2021-12-15 11:15:50 +08:00
committed by Greg Kroah-Hartman
parent 7c0d9c815c
commit 0e04518b1d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/codecs/rt5663.c
View File

@@ -3461,6 +3461,7 @@ static void rt5663_calibrate(struct rt5663_priv *rt5663)
static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev) static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev)
{ {
int table_size; int table_size;
int ret;
device_property_read_u32(dev, "realtek,dc_offset_l_manual", device_property_read_u32(dev, "realtek,dc_offset_l_manual",
&rt5663->pdata.dc_offset_l_manual); &rt5663->pdata.dc_offset_l_manual);
@@ -3477,9 +3478,11 @@ static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev)
table_size = sizeof(struct impedance_mapping_table) * table_size = sizeof(struct impedance_mapping_table) *
rt5663->pdata.impedance_sensing_num; rt5663->pdata.impedance_sensing_num;
rt5663->imp_table = devm_kzalloc(dev, table_size, GFP_KERNEL); rt5663->imp_table = devm_kzalloc(dev, table_size, GFP_KERNEL);
device_property_read_u32_array(dev, ret = device_property_read_u32_array(dev,
"realtek,impedance_sensing_table", "realtek,impedance_sensing_table",
(u32 *)rt5663->imp_table, table_size); (u32 *)rt5663->imp_table, table_size);
if (ret)
return ret;
} }
return 0; return 0;
@@ -3504,8 +3507,11 @@ static int rt5663_i2c_probe(struct i2c_client *i2c,
if (pdata) if (pdata)
rt5663->pdata = *pdata; rt5663->pdata = *pdata;
else else {
rt5663_parse_dp(rt5663, &i2c->dev); ret = rt5663_parse_dp(rt5663, &i2c->dev);
if (ret)
return ret;
}
for (i = 0; i < ARRAY_SIZE(rt5663->supplies); i++) for (i = 0; i < ARRAY_SIZE(rt5663->supplies); i++)
rt5663->supplies[i].supply = rt5663_supply_names[i]; rt5663->supplies[i].supply = rt5663_supply_names[i];