diff options
| author | Tzung-Bi Shih <tzungbi@google.com> | 2019-05-22 22:54:02 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-23 14:34:43 +0100 |
| commit | 63ba8e4d04ab921f8aaa89227d2e0f7ad79725be (patch) | |
| tree | fa9bc1423c79f03b9bdd54a8823c16674bd37546 /sound/soc/mediatek/mt8183 | |
| parent | 108d0d40b932f80fc7f1dbd1de548d666e649a4b (diff) | |
| download | linux-63ba8e4d04ab921f8aaa89227d2e0f7ad79725be.tar.gz linux-63ba8e4d04ab921f8aaa89227d2e0f7ad79725be.tar.bz2 linux-63ba8e4d04ab921f8aaa89227d2e0f7ad79725be.zip | |
ASoC: mediatek: mt8183: move card registration to the end of probe
mt8183_mt6358_ts3a227_max98357_dev_probe() does not return immediately
if devm_snd_soc_register_card() returns fail. As a result, the rest of
code still get executed.
Two options to fix:
1. add an extra return statement if devm_snd_soc_register_card()
returns fail
2. move devm_snd_soc_register_card() to the end of probe
Adopt option 2 which is more clear and common.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/mediatek/mt8183')
| -rw-r--r-- | sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index 1ba7aa58e4b6..23c422f13808 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -331,7 +331,7 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) struct device_node *platform_node; struct snd_soc_dai_link *dai_link; struct pinctrl *default_pins; - int ret, i; + int i; card->dev = &pdev->dev; @@ -366,11 +366,6 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) return -EINVAL; } - ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret) - dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", - __func__, ret); - default_pins = devm_pinctrl_get_select(&pdev->dev, PINCTRL_STATE_DEFAULT); if (IS_ERR(default_pins)) { @@ -379,7 +374,7 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) return PTR_ERR(default_pins); } - return ret; + return devm_snd_soc_register_card(&pdev->dev, card); } #ifdef CONFIG_OF |