diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 13:32:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-13 13:32:54 +0100 |
| commit | dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c (patch) | |
| tree | 4573b99fb11e5b93bd011045039b370ddafe45e6 /sound/soc/soc-core.c | |
| parent | f1992dde7fef6713a469a5a142b86812b8a47f9e (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
| download | linux-dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c.tar.gz linux-dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c.tar.bz2 linux-dc2af52c0d6d00fd530e4a5e300834cdb1bb1c1c.zip | |
Merge tag 'v3.4-rc7' into for-3.5
Linux 3.4-rc7
Conflicts):
drivers/base/regmap/regmap.c (overlap with bug fixes)
sound/soc/blackfin/bf5xx-ssm2602.c (overlap with bug fixes)
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a61671b89e9b..2783d2b00dba 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3380,6 +3380,7 @@ int snd_soc_register_card(struct snd_soc_card *card) GFP_KERNEL); if (card->rtd == NULL) return -ENOMEM; + card->num_rtd = 0; card->rtd_aux = &card->rtd[card->num_links]; for (i = 0; i < card->num_links; i++) @@ -3907,10 +3908,10 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, int i, ret; num_routes = of_property_count_strings(np, propname); - if (num_routes & 1) { + if (num_routes < 0 || num_routes & 1) { dev_err(card->dev, - "Property '%s's length is not even\n", - propname); + "Property '%s' does not exist or its length is not even\n", + propname); return -EINVAL; } num_routes /= 2; |