|
@@ -964,7 +964,8 @@ static int wm8955_register(struct wm8955_priv *wm8955,
|
|
|
|
|
|
if (wm8955_codec) {
|
|
if (wm8955_codec) {
|
|
dev_err(codec->dev, "Another WM8955 is registered\n");
|
|
dev_err(codec->dev, "Another WM8955 is registered\n");
|
|
- return -EINVAL;
|
|
|
|
|
|
+ ret = -EINVAL;
|
|
|
|
+ goto err;
|
|
}
|
|
}
|
|
|
|
|
|
mutex_init(&codec->mutex);
|
|
mutex_init(&codec->mutex);
|
|
@@ -1047,18 +1048,19 @@ static int wm8955_register(struct wm8955_priv *wm8955,
|
|
ret = snd_soc_register_codec(codec);
|
|
ret = snd_soc_register_codec(codec);
|
|
if (ret != 0) {
|
|
if (ret != 0) {
|
|
dev_err(codec->dev, "Failed to register codec: %d\n", ret);
|
|
dev_err(codec->dev, "Failed to register codec: %d\n", ret);
|
|
- return ret;
|
|
|
|
|
|
+ goto err_enable;
|
|
}
|
|
}
|
|
|
|
|
|
ret = snd_soc_register_dai(&wm8955_dai);
|
|
ret = snd_soc_register_dai(&wm8955_dai);
|
|
if (ret != 0) {
|
|
if (ret != 0) {
|
|
dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
|
|
dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
|
|
- snd_soc_unregister_codec(codec);
|
|
|
|
- return ret;
|
|
|
|
|
|
+ goto err_codec;
|
|
}
|
|
}
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
+err_codec:
|
|
|
|
+ snd_soc_unregister_codec(codec);
|
|
err_enable:
|
|
err_enable:
|
|
regulator_bulk_disable(ARRAY_SIZE(wm8955->supplies), wm8955->supplies);
|
|
regulator_bulk_disable(ARRAY_SIZE(wm8955->supplies), wm8955->supplies);
|
|
err_get:
|
|
err_get:
|