Skip to content

Commit 2772ee6

Browse files
Tang Binbroonie
authored andcommitted
ASoC: topology: Fix redundant logical jump
In the function soc_tplg_dai_config, the logical jump of 'goto err' is redundant, so remove it. Signed-off-by: Tang Bin <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 49e2e35 commit 2772ee6

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

sound/soc/soc-topology.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,15 +1894,15 @@ static int soc_tplg_dai_config(struct soc_tplg *tplg,
18941894
caps = &d->caps[SND_SOC_TPLG_STREAM_PLAYBACK];
18951895
ret = set_stream_info(tplg, stream, caps);
18961896
if (ret < 0)
1897-
goto err;
1897+
return ret;
18981898
}
18991899

19001900
if (d->capture) {
19011901
stream = &dai_drv->capture;
19021902
caps = &d->caps[SND_SOC_TPLG_STREAM_CAPTURE];
19031903
ret = set_stream_info(tplg, stream, caps);
19041904
if (ret < 0)
1905-
goto err;
1905+
return ret;
19061906
}
19071907

19081908
if (d->flag_mask)
@@ -1914,13 +1914,10 @@ static int soc_tplg_dai_config(struct soc_tplg *tplg,
19141914
ret = soc_tplg_dai_load(tplg, dai_drv, NULL, dai);
19151915
if (ret < 0) {
19161916
dev_err(tplg->dev, "ASoC: DAI loading failed\n");
1917-
goto err;
1917+
return ret;
19181918
}
19191919

19201920
return 0;
1921-
1922-
err:
1923-
return ret;
19241921
}
19251922

19261923
/* load physical DAI elements */

0 commit comments

Comments
 (0)