From: Colin Ian King Date: Thu, 2 Jul 2020 11:48:35 +0000 (+0100) Subject: ASoC: Intel: bxt-da7219-max98357a: return -EINVAL on unrecognized speaker amplifier X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c950e9fcc79b8fedd3126ede4dcd70add8ea5339;p=linux.git ASoC: Intel: bxt-da7219-max98357a: return -EINVAL on unrecognized speaker amplifier Currently if the ctx->spkamp is not recognized an error message is reported but the code continues to set up the device with uninitialized variables such as the number of widgets. Fix this by returning -EINVAL for unrecognized speaker amplifier types. Fixes: e1435a1feb18 ("ASoC: Intel: bxt-da7219-max98357a: support MAX98390 speaker amp") Signed-off-by: Colin Ian King Acked-by: Pierre-Louis Bossart Addresses-Coverity: ("Uninitialized scalar variable") Link: https://lore.kernel.org/r/20200702114835.37889-1-colin.king@canonical.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index 4d39253e796b1..0c0a717823c40 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -677,7 +677,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) break; default: dev_err(card->dev, "Invalid speaker amplifier %d\n", ctx->spkamp); - break; + return -EINVAL; } err = snd_soc_dapm_new_controls(&card->dapm, widgets, num_widgets);