niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: cs35l32: Minor error paths fixups

Browse source 
Correct some unchecked re-allocations of ret whilst reading the device
ID and ensure the hardware state is returned to off on the error
paths.

Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210510131357.17170-3-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2021-05-10 14:13:49 +01:00 • committed by Mark Brown
parent c8b198ed31
commit 283160f141
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sound/soc/codecs/cs35l32.c
View file

@ -30,6 +30,7 @@
#include <dt-bindings/sound/cs35l32.h> #include <dt-bindings/sound/cs35l32.h>
#include "cs35l32.h" #include "cs35l32.h"
#include "cirrus_legacy.h"
#define CS35L32_NUM_SUPPLIES 2 #define CS35L32_NUM_SUPPLIES 2
static const char *const cs35l32_supply_names[CS35L32_NUM_SUPPLIES] = { static const char *const cs35l32_supply_names[CS35L32_NUM_SUPPLIES] = {
@ -348,8 +349,7 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client,
struct cs35l32_private *cs35l32; struct cs35l32_private *cs35l32;
struct cs35l32_platform_data *pdata = struct cs35l32_platform_data *pdata =
dev_get_platdata(&i2c_client->dev); dev_get_platdata(&i2c_client->dev);
int ret, i; int ret, i, devid;
unsigned int devid = 0;
unsigned int reg; unsigned int reg;
cs35l32 = devm_kzalloc(&i2c_client->dev, sizeof(*cs35l32), GFP_KERNEL); cs35l32 = devm_kzalloc(&i2c_client->dev, sizeof(*cs35l32), GFP_KERNEL);
@ -404,40 +404,40 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client,
/* Reset the Device */ /* Reset the Device */
cs35l32->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev, cs35l32->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev,
"reset", GPIOD_OUT_LOW); "reset", GPIOD_OUT_LOW);
if (IS_ERR(cs35l32->reset_gpio)) if (IS_ERR(cs35l32->reset_gpio)) {
return PTR_ERR(cs35l32->reset_gpio); ret = PTR_ERR(cs35l32->reset_gpio);
goto err_supplies;
}
gpiod_set_value_cansleep(cs35l32->reset_gpio, 1); gpiod_set_value_cansleep(cs35l32->reset_gpio, 1);
/* initialize codec */ /* initialize codec */
ret = regmap_read(cs35l32->regmap, CS35L32_DEVID_AB, &reg); devid = cirrus_read_device_id(cs35l32->regmap, CS35L32_DEVID_AB);
devid = (reg & 0xFF) << 12; if (devid < 0) {
ret = devid;
ret = regmap_read(cs35l32->regmap, CS35L32_DEVID_CD, &reg); dev_err(&i2c_client->dev, "Failed to read device ID: %d\n", ret);
devid |= (reg & 0xFF) << 4; goto err_disable;
}
ret = regmap_read(cs35l32->regmap, CS35L32_DEVID_E, &reg);
devid |= (reg & 0xF0) >> 4;
if (devid != CS35L32_CHIP_ID) { if (devid != CS35L32_CHIP_ID) {
ret = -ENODEV; ret = -ENODEV;
dev_err(&i2c_client->dev, dev_err(&i2c_client->dev,
"CS35L32 Device ID (%X). Expected %X\n", "CS35L32 Device ID (%X). Expected %X\n",
devid, CS35L32_CHIP_ID); devid, CS35L32_CHIP_ID);
return ret; goto err_disable;
} }
ret = regmap_read(cs35l32->regmap, CS35L32_REV_ID, &reg); ret = regmap_read(cs35l32->regmap, CS35L32_REV_ID, &reg);
if (ret < 0) { if (ret < 0) {
dev_err(&i2c_client->dev, "Get Revision ID failed\n"); dev_err(&i2c_client->dev, "Get Revision ID failed\n");
return ret; goto err_disable;
} }
ret = regmap_register_patch(cs35l32->regmap, cs35l32_monitor_patch, ret = regmap_register_patch(cs35l32->regmap, cs35l32_monitor_patch,
ARRAY_SIZE(cs35l32_monitor_patch)); ARRAY_SIZE(cs35l32_monitor_patch));
if (ret < 0) { if (ret < 0) {
dev_err(&i2c_client->dev, "Failed to apply errata patch\n"); dev_err(&i2c_client->dev, "Failed to apply errata patch\n");
return ret; goto err_disable;
} }
dev_info(&i2c_client->dev, dev_info(&i2c_client->dev,
@ -478,7 +478,7 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client,
CS35L32_PDN_AMP); CS35L32_PDN_AMP);
/* Clear MCLK Error Bit since we don't have the clock yet */ /* Clear MCLK Error Bit since we don't have the clock yet */
ret = regmap_read(cs35l32->regmap, CS35L32_INT_STATUS_1, &reg); regmap_read(cs35l32->regmap, CS35L32_INT_STATUS_1, &reg);
ret = devm_snd_soc_register_component(&i2c_client->dev, ret = devm_snd_soc_register_component(&i2c_client->dev,
&soc_component_dev_cs35l32, cs35l32_dai, &soc_component_dev_cs35l32, cs35l32_dai,
@ -489,6 +489,8 @@ static int cs35l32_i2c_probe(struct i2c_client *i2c_client,
return 0; return 0;
err_disable: err_disable:
gpiod_set_value_cansleep(cs35l32->reset_gpio, 0);
err_supplies:
regulator_bulk_disable(ARRAY_SIZE(cs35l32->supplies), regulator_bulk_disable(ARRAY_SIZE(cs35l32->supplies),
cs35l32->supplies); cs35l32->supplies);
return ret; return ret;