Unverified Commit e371eadf authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: cs35l41: Don't overwrite returned error code 



In multiple places the driver overwrites the error code returned with
a static error code, this is not helpful for debugging. Update to pass
the error codes straight through.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210914141349.30218-4-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fe1024d5

sound/soc/codecs/cs35l41.c

+0 −8
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ static int cs35l41_otp_unpack(void *data) 
	ret = regmap_read(cs35l41->regmap, CS35L41_OTPID, &otp_id_reg);

	if (ret < 0) {

		dev_err(cs35l41->dev, "Read OTP ID failed\n");

		ret = -EINVAL;

		goto err_otp_unpack;

	}
@@ -337,7 +336,6 @@ static int cs35l41_otp_unpack(void *data) 
						CS35L41_OTP_SIZE_WORDS);

	if (ret < 0) {

		dev_err(cs35l41->dev, "Read OTP Mem failed\n");

		ret = -EINVAL;

		goto err_otp_unpack;

	}
@@ -352,13 +350,11 @@ static int cs35l41_otp_unpack(void *data) 
	ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x00000055);

	if (ret < 0) {

		dev_err(cs35l41->dev, "Write Unlock key failed 1/2\n");

		ret = -EINVAL;

		goto err_otp_unpack;

	}

	ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x000000AA);

	if (ret < 0) {

		dev_err(cs35l41->dev, "Write Unlock key failed 2/2\n");

		ret = -EINVAL;

		goto err_otp_unpack;

	}
@@ -398,7 +394,6 @@ static int cs35l41_otp_unpack(void *data) 
						otp_val << otp_map[i].shift);

			if (ret < 0) {

				dev_err(cs35l41->dev, "Write OTP val failed\n");

				ret = -EINVAL;

				goto err_otp_unpack;

			}

		}
@@ -407,13 +402,11 @@ static int cs35l41_otp_unpack(void *data) 
	ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x000000CC);

	if (ret < 0) {

		dev_err(cs35l41->dev, "Write Lock key failed 1/2\n");

		ret = -EINVAL;

		goto err_otp_unpack;

	}

	ret = regmap_write(cs35l41->regmap, CS35L41_TEST_KEY_CTL, 0x00000033);

	if (ret < 0) {

		dev_err(cs35l41->dev, "Write Lock key failed 2/2\n");

		ret = -EINVAL;

		goto err_otp_unpack;

	}

	ret = 0;
@@ -1413,7 +1406,6 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, 
	/* CS35L41 needs INT for PDN_DONE */

	if (ret != 0) {

		dev_err(cs35l41->dev, "Failed to request IRQ: %d\n", ret);

		ret = -ENODEV;

		goto err;

	}