TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: cs42l56: fix up error handling in probe

Browse Source 
[ Upstream commit 856fe64da84c95a1d415564b981ae3908eea2a76 ]

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:
Dan Carpenter
2020-12-11 13:07:59 +03:00
committed by Greg Kroah-Hartman
parent abd1df54af
commit 3e92cbbfab
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/cs42l56.c
View File

@@ -1260,6 +1260,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
dev_err(&i2c_client->dev, dev_err(&i2c_client->dev,
"CS42L56 Device ID (%X). Expected %X\n", "CS42L56 Device ID (%X). Expected %X\n",
devid, CS42L56_DEVID); devid, CS42L56_DEVID);
ret = -EINVAL;
goto err_enable; goto err_enable;
} }
alpha_rev = reg & CS42L56_AREV_MASK; alpha_rev = reg & CS42L56_AREV_MASK;
@@ -1317,7 +1318,7 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
ret = devm_snd_soc_register_component(&i2c_client->dev, ret = devm_snd_soc_register_component(&i2c_client->dev,
&soc_component_dev_cs42l56, &cs42l56_dai, 1); &soc_component_dev_cs42l56, &cs42l56_dai, 1);
if (ret < 0) if (ret < 0)
return ret; goto err_enable;
return 0; return 0;