Skip to content

Commit 116bcd9

Browse files
AxelLinbroonie
authored andcommitted
ASoC: wm9081: fix resource reclaim in wm9081_register error path
This patch fixes the error path in wm9081_register to properly free resources. Signed-off-by: Axel Lin <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent d484366 commit 116bcd9

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

sound/soc/codecs/wm9081.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,7 @@ static int wm9081_register(struct wm9081_priv *wm9081,
13561356
ret = snd_soc_codec_set_cache_io(codec, 8, 16, control);
13571357
if (ret != 0) {
13581358
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
1359-
return ret;
1359+
goto err;
13601360
}
13611361

13621362
reg = snd_soc_read(codec, WM9081_SOFTWARE_RESET);
@@ -1369,7 +1369,7 @@ static int wm9081_register(struct wm9081_priv *wm9081,
13691369
ret = wm9081_reset(codec);
13701370
if (ret < 0) {
13711371
dev_err(codec->dev, "Failed to issue reset\n");
1372-
return ret;
1372+
goto err;
13731373
}
13741374

13751375
wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ -1388,18 +1388,19 @@ static int wm9081_register(struct wm9081_priv *wm9081,
13881388
ret = snd_soc_register_codec(codec);
13891389
if (ret != 0) {
13901390
dev_err(codec->dev, "Failed to register codec: %d\n", ret);
1391-
return ret;
1391+
goto err;
13921392
}
13931393

13941394
ret = snd_soc_register_dai(&wm9081_dai);
13951395
if (ret != 0) {
13961396
dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
1397-
snd_soc_unregister_codec(codec);
1398-
return ret;
1397+
goto err_codec;
13991398
}
14001399

14011400
return 0;
14021401

1402+
err_codec:
1403+
snd_soc_unregister_codec(codec);
14031404
err:
14041405
kfree(wm9081);
14051406
return ret;

0 commit comments

Comments
 (0)