diff options
| author |   Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-01-10 08:18:32 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-01-28 16:00:22 +0000 |
| commit | 73d4c3135b2aa2308fe058f58ddbf658436aa385 (patch) | |
| tree | 3d8d2d4359fccdcc85fe9d0f38aaf20a890f7027 /sound/soc/codecs/cs42l51-i2c.c | |
| parent | Tegra234 APE support (diff) | |
| download | wireguard-linux-73d4c3135b2aa2308fe058f58ddbf658436aa385.tar.xz wireguard-linux-73d4c3135b2aa2308fe058f58ddbf658436aa385.zip | |
ASoC: cs42l51: Improve error handling in cs42l51_remove()
When disabling a regulator fails while the device goes away, there is
little we can do and the machine is probably in enough trouble that any
action we'd want to take fails anyhow.
The return value used to be passed on in cs42l51_i2c_remove() (i.e. the
i2c device remove callback). But the i2c core ignores the error code
(apart from emitting a generic warning) and removes the device anyhow.
So return 0 unconditionally in cs42l51_i2c_remove(), and instead of
returning the error code to the upper layer emit a more helpful warning
message. After that nobody is interested any more in the actual error
code, so let cs42l51_remove() return void.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220110071832.306185-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/cs42l51-i2c.c')
| -rw-r--r-- | sound/soc/codecs/cs42l51-i2c.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l51-i2c.c b/sound/soc/codecs/cs42l51-i2c.c index 70260e0a8f09..3cb21a2ba29f 100644 --- a/sound/soc/codecs/cs42l51-i2c.c +++ b/sound/soc/codecs/cs42l51-i2c.c @@ -31,7 +31,9 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c, static int cs42l51_i2c_remove(struct i2c_client *i2c) { - return cs42l51_remove(&i2c->dev); + cs42l51_remove(&i2c->dev); + + return 0; } static const struct dev_pm_ops cs42l51_pm_ops = { |