korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 14:04:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: cs42l73: 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-9-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2021-05-10 14:13:55 +01:00 committed by Mark Brown
parent 0a0eb567e1
commit 26495252fe
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/soc/codecs/cs42l73.c
View File

@ -27,6 +27,7 @@
#include <sound/tlv.h> #include <sound/tlv.h>
#include <sound/cs42l73.h> #include <sound/cs42l73.h>
#include "cs42l73.h" #include "cs42l73.h"
#include "cirrus_legacy.h"
struct sp_config { struct sp_config {
u8 spc, mmcc, spfs; u8 spc, mmcc, spfs;
@ -1275,8 +1276,7 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
{ {
struct cs42l73_private *cs42l73; struct cs42l73_private *cs42l73;
struct cs42l73_platform_data *pdata = dev_get_platdata(&i2c_client->dev); struct cs42l73_platform_data *pdata = dev_get_platdata(&i2c_client->dev);
int ret; int ret, devid;
unsigned int devid = 0;
unsigned int reg; unsigned int reg;
u32 val32; u32 val32;
@ -1326,27 +1326,25 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
} }
/* initialize codec */ /* initialize codec */
ret = regmap_read(cs42l73->regmap, CS42L73_DEVID_AB, &reg); devid = cirrus_read_device_id(cs42l73->regmap, CS42L73_DEVID_AB);
devid = (reg & 0xFF) << 12; if (devid < 0) {
ret = devid;
ret = regmap_read(cs42l73->regmap, CS42L73_DEVID_CD, &reg); dev_err(&i2c_client->dev, "Failed to read device ID: %d\n", ret);
devid |= (reg & 0xFF) << 4; goto err_reset;
}
ret = regmap_read(cs42l73->regmap, CS42L73_DEVID_E, &reg);
devid |= (reg & 0xF0) >> 4;
if (devid != CS42L73_DEVID) { if (devid != CS42L73_DEVID) {
ret = -ENODEV; ret = -ENODEV;
dev_err(&i2c_client->dev, dev_err(&i2c_client->dev,
"CS42L73 Device ID (%X). Expected %X\n", "CS42L73 Device ID (%X). Expected %X\n",
devid, CS42L73_DEVID); devid, CS42L73_DEVID);
return ret; goto err_reset;
} }
ret = regmap_read(cs42l73->regmap, CS42L73_REVID, &reg); ret = regmap_read(cs42l73->regmap, CS42L73_REVID, &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_reset;
} }
dev_info(&i2c_client->dev, dev_info(&i2c_client->dev,
@ -1356,8 +1354,14 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
&soc_component_dev_cs42l73, cs42l73_dai, &soc_component_dev_cs42l73, cs42l73_dai,
ARRAY_SIZE(cs42l73_dai)); ARRAY_SIZE(cs42l73_dai));
if (ret < 0) if (ret < 0)
return ret; goto err_reset;
return 0; return 0;
err_reset:
gpio_set_value_cansleep(cs42l73->pdata.reset_gpio, 0);
return ret;
} }
static const struct of_device_id cs42l73_of_match[] = { static const struct of_device_id cs42l73_of_match[] = {