| From 1be1d6a2a2ab3d519ffe17ae4b8a4cc9a50bbceb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 11 Dec 2020 13:07:59 +0300 |
| Subject: ASoC: cs42l56: fix up error handling in probe |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ 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: 272b5edd3b8f ("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> |
| --- |
| sound/soc/codecs/cs42l56.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c |
| index a5c8736fad777..04f89b751304c 100644 |
| --- a/sound/soc/codecs/cs42l56.c |
| +++ b/sound/soc/codecs/cs42l56.c |
| @@ -1260,6 +1260,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; |
| @@ -1317,7 +1318,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; |
| |
| -- |
| 2.27.0 |
| |
