diff options
| author | Mark Brown <broonie@kernel.org> | 2017-09-01 13:12:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-01 13:12:09 +0200 |
| commit | 72aaea38a266639fdc4c8cfc2c421735fd3bbda9 (patch) | |
| tree | 910313b19a44c0599767f60ad3f56083fe928104 /sound/soc/generic | |
| parent | Linux 4.13-rc7 (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/rt5670' into asoc-fixes (diff) | |
| download | linux-72aaea38a266639fdc4c8cfc2c421735fd3bbda9.tar.xz linux-72aaea38a266639fdc4c8cfc2c421735fd3bbda9.zip | |
Merge tag 'asoc-fix-v4.13-rc7' into asoc-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.
# gpg: Signature made Thu 31 Aug 2017 12:50:29 BST
# gpg: using RSA key ADE668AA675718B59FE29FEA24D68B725D5487D0
# gpg: issuer "broonie@kernel.org"
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" [unknown]
# gpg: aka "Mark Brown <broonie@debian.org>" [unknown]
# gpg: aka "Mark Brown <broonie@kernel.org>" [unknown]
# gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>" [unknown]
# gpg: aka "Mark Brown <broonie@linaro.org>" [unknown]
# gpg: aka "Mark Brown <Mark.Brown@linaro.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 3F25 68AA C269 98F9 E813 A1C5 C3F4 36CA 30F5 D8EB
# Subkey fingerprint: ADE6 68AA 6757 18B5 9FE2 9FEA 24D6 8B72 5D54 87D0
Diffstat (limited to 'sound/soc/generic')
| -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); |