mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-19 17:11:03 +00:00
ASoC: cs42l56: fix up error handling in probe
[ Upstream commit856fe64da8
] There are two issues with this code. The first error path forgot to set the error code and instead returns success. The second error path doesn't clean up. Fixes:272b5edd3b
("ASoC: Add support for CS42L56 CODEC") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Link: https://lore.kernel.org/r/X9NE/9nK9/TuxuL+@mwanda Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
967ddb4ac9
commit
43deab1aff
1 changed files with 2 additions and 1 deletions
|
@ -1249,6 +1249,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
|
|||
dev_err(&i2c_client->dev,
|
||||
"CS42L56 Device ID (%X). Expected %X\n",
|
||||
devid, CS42L56_DEVID);
|
||||
ret = -EINVAL;
|
||||
goto err_enable;
|
||||
}
|
||||
alpha_rev = reg & CS42L56_AREV_MASK;
|
||||
|
@ -1306,7 +1307,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
|
|||
ret = devm_snd_soc_register_component(&i2c_client->dev,
|
||||
&soc_component_dev_cs42l56, &cs42l56_dai, 1);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
goto err_enable;
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue