diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 10:07:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 10:07:06 -0700 |
| commit | 1c2f95480648ed7326ab2288ca0e2d35551db4be (patch) | |
| tree | fa69d267423242eaad195e60c74570152e6c3d84 /sound/soc/soc-core.c | |
| parent | 59068e369b6a2a0a15b93624887525d9ec0f36e5 (diff) | |
| parent | e9e7183fd2677aca24e90ca1556d4afe7436d42d (diff) | |
| download | linux-1c2f95480648ed7326ab2288ca0e2d35551db4be.tar.gz linux-1c2f95480648ed7326ab2288ca0e2d35551db4be.tar.bz2 linux-1c2f95480648ed7326ab2288ca0e2d35551db4be.zip | |
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound sound fixes from Takashi Iwai:
"As good as nothing exciting here; just a few trivial fixes for various
ASoC stuff."
* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: omap-pcm: Free dma buffers in case of error.
ASoC: s3c2412-i2s: Fix dai registration
ASoC: wm8350: Don't use locally allocated codec struct
ASoC: tlv312aic23: unbreak resume
ASoC: bf5xx-ssm2602: Set DAI format
ASoC: core: check of_property_count_strings failure
ASoC: dt: sgtl5000.txt: Add description for 'reg' field
ASoC: wm_hubs: Make sure we don't disable differential line outputs
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1d6a80c9f4c2..c88d9741b9e7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3625,10 +3625,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; |