Commit 0e49a4de authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

ASoC: cs42l52: Minor tidy up of error paths

Fixup a needlessly initialised variable and an unchecked return
value.
Reported-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210511175718.15416-5-ckeepax@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent b1078e98
...@@ -1175,7 +1175,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, ...@@ -1175,7 +1175,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
struct cs42l56_platform_data *pdata = struct cs42l56_platform_data *pdata =
dev_get_platdata(&i2c_client->dev); dev_get_platdata(&i2c_client->dev);
int ret, i; int ret, i;
unsigned int devid = 0; unsigned int devid;
unsigned int alpha_rev, metal_rev; unsigned int alpha_rev, metal_rev;
unsigned int reg; unsigned int reg;
...@@ -1245,6 +1245,11 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, ...@@ -1245,6 +1245,11 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
} }
ret = regmap_read(cs42l56->regmap, CS42L56_CHIP_ID_1, &reg); ret = regmap_read(cs42l56->regmap, CS42L56_CHIP_ID_1, &reg);
if (ret) {
dev_err(&i2c_client->dev, "Failed to read chip ID: %d\n", ret);
return ret;
}
devid = reg & CS42L56_CHIP_ID_MASK; devid = reg & CS42L56_CHIP_ID_MASK;
if (devid != CS42L56_DEVID) { if (devid != CS42L56_DEVID) {
dev_err(&i2c_client->dev, dev_err(&i2c_client->dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment