diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-08-31 14:08:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-31 14:08:26 +0200 |
| commit | 83b033bd33a8b7b16f568e3432d3e27d03ef9c82 (patch) | |
| tree | f73c40848c80363b41591ee8511f94b466f69cf8 /sound/soc/generic/simple-card-utils.c | |
| parent | bcab3a6e64a9647e022b46182c9687a8c3aa9d11 (diff) | |
| parent | 05997302b7aa56a7f4a7b9d49d0661865c17874d (diff) | |
Merge tag 'asoc-fix-v4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.13
A couple of fixes, one for a regression in simple-card introduced during
the merge window that was only reported this week and another for a
regression in registration of ACPI GPIOs.
Diffstat (limited to 'sound/soc/generic/simple-card-utils.c')
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 7d7ab4aee42e..d72f7d58102f 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -132,7 +132,7 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, /* Parse the card name from DT */ ret = snd_soc_of_parse_card_name(card, "label"); - if (ret < 0) { + if (ret < 0 || !card->name) { char prop[128]; snprintf(prop, sizeof(prop), "%sname", prefix); |