瀏覽代碼

ASoC: tegra_alc5632: check return value

We have been returning success even if snd_soc_card_jack_new() fails.
Lets check the return value and return error if it fails.

Fixes: 12cc6d1dca4d ("ASoC: tegra_alc5632: Register jacks at the card level")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Sudip Mukherjee 9 年之前
父節點
當前提交
319c32597f
共有 1 個文件被更改,包括 8 次插入4 次删除
  1. 8 4
      sound/soc/tegra/tegra_alc5632.c

+ 8 - 4
sound/soc/tegra/tegra_alc5632.c

@@ -101,12 +101,16 @@ static const struct snd_kcontrol_new tegra_alc5632_controls[] = {
 
 
 static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
 static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
 {
 {
+	int ret;
 	struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);
 	struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);
 
 
-	snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET,
-			      &tegra_alc5632_hs_jack,
-			      tegra_alc5632_hs_jack_pins,
-			      ARRAY_SIZE(tegra_alc5632_hs_jack_pins));
+	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",
+				    SND_JACK_HEADSET,
+				    &tegra_alc5632_hs_jack,
+				    tegra_alc5632_hs_jack_pins,
+				    ARRAY_SIZE(tegra_alc5632_hs_jack_pins));
+	if (ret)
+		return ret;
 
 
 	if (gpio_is_valid(machine->gpio_hp_det)) {
 	if (gpio_is_valid(machine->gpio_hp_det)) {
 		tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;
 		tegra_alc5632_hp_jack_gpio.gpio = machine->gpio_hp_det;