ASoC: core: check of_property_count_strings failure

Signed-off-by: Richard Zhao <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
klaby · Apr 24, 2012 · c34ce32 · c34ce32
1 parent ddb6706
commit c34ce32
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
@@ -3631,10 +3631,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;