[1/1] ASoC: Core: check of_property_count_strings failure

Message ID 1335252283-27750-1-git-send-email-richard.zhao@freescale.com
State New
Headers show

Commit Message

Richard Zhao April 24, 2012, 7:24 a.m.
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
 sound/soc/soc-core.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 20e55531..ce4d462 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3683,10 +3683,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;