Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c62f9d8f authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: tas2552: Return proper error for probe error paths 



Return error if devm_regulator_bulk_get() or snd_soc_register_codec() fails.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e295a4a4

sound/soc/codecs/tas2552.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -482,8 +482,10 @@ static int tas2552_probe(struct i2c_client *client, 




	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(data->supplies),

	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(data->supplies),

				      data->supplies);

				      data->supplies);

	if (ret != 0)

	if (ret != 0) {

		dev_err(dev, "Failed to request supplies: %d\n", ret);

		dev_err(dev, "Failed to request supplies: %d\n", ret);

		return ret;

	}





	pm_runtime_set_active(&client->dev);

	pm_runtime_set_active(&client->dev);

	pm_runtime_set_autosuspend_delay(&client->dev, 1000);

	pm_runtime_set_autosuspend_delay(&client->dev, 1000);
@@ -500,7 +502,7 @@ static int tas2552_probe(struct i2c_client *client, 
	if (ret < 0)

	if (ret < 0)

		dev_err(&client->dev, "Failed to register codec: %d\n", ret);

		dev_err(&client->dev, "Failed to register codec: %d\n", ret);





	return 0;

	return ret;

}

}





static int tas2552_i2c_remove(struct i2c_client *client)

static int tas2552_i2c_remove(struct i2c_client *client)