From a6410a25ccd1a359e04f5cf67a4f64e9972ecaf5 Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Wed, 11 Jul 2012 17:36:34 +0200 Subject: [PATCH] --- yaml --- r: 316314 b: refs/heads/master c: b761c0ca2e964a240d74e50da9e27dc0b3be0649 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3ad89f7cfadd..52a5a90eb9a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c6af635fd77251b753cb1c07a6a6f306ba4e287 +refs/heads/master: b761c0ca2e964a240d74e50da9e27dc0b3be0649 diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 64b464ca3bc5..f219b2f7ee68 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -4136,6 +4136,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, dev_err(card->dev, "Property '%s' index %d could not be read: %d\n", propname, 2 * i, ret); + kfree(routes); return -EINVAL; } ret = of_property_read_string_index(np, propname, @@ -4144,6 +4145,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, dev_err(card->dev, "Property '%s' index %d could not be read: %d\n", propname, (2 * i) + 1, ret); + kfree(routes); return -EINVAL; } }