Commit 39870b0d authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Mark Brown

ASoC: DMI long name - avoid to add board name if matches with product name

Current code:

  LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC

With the patch:

  LENOVO-20QE000VMC-ThinkPadX1Carbon7th
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20191120174435.30920-2-perex@perex.czReviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4e01e5db
...@@ -1798,7 +1798,8 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) ...@@ -1798,7 +1798,8 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
board = dmi_get_system_info(DMI_BOARD_NAME); board = dmi_get_system_info(DMI_BOARD_NAME);
if (board && is_dmi_valid(board)) { if (board && is_dmi_valid(board)) {
append_dmi_string(card, board); if (!product || strcasecmp(board, product))
append_dmi_string(card, board);
} else if (!product) { } else if (!product) {
/* fall back to using legacy name */ /* fall back to using legacy name */
dev_warn(card->dev, "ASoC: no DMI board/product name!\n"); dev_warn(card->dev, "ASoC: no DMI board/product name!\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment