diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2019-11-20 18:44:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:54:50 +0000 |
| commit | 39870b0dec68ed7dd814beb697e541670975c7d8 (patch) | |
| tree | 6802b34020311555c17390850cbec125df69908d /sound | |
| parent | 4e01e5dbba96f731119f3f1a6bf51b54c98c5940 (diff) | |
| download | linux-stable-39870b0dec68ed7dd814beb697e541670975c7d8.tar.gz linux-stable-39870b0dec68ed7dd814beb697e541670975c7d8.tar.bz2 linux-stable-39870b0dec68ed7dd814beb697e541670975c7d8.zip | |
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: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20191120174435.30920-2-perex@perex.cz
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a1f4d64a0a18..062653ab03a3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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); if (board && is_dmi_valid(board)) { - append_dmi_string(card, board); + if (!product || strcasecmp(board, product)) + append_dmi_string(card, board); } else if (!product) { /* fall back to using legacy name */ dev_warn(card->dev, "ASoC: no DMI board/product name!\n"); |