summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMatthias Kaehlcke <matthias@kaehlcke.net>2012-07-11 17:36:34 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-11 18:40:57 +0100
commitb761c0ca2e964a240d74e50da9e27dc0b3be0649 (patch)
tree30fc823891c0cba7aff989d0d932eed04bddc1a3 /sound
parent5c6af635fd77251b753cb1c07a6a6f306ba4e287 (diff)
downloadlinux-stable-b761c0ca2e964a240d74e50da9e27dc0b3be0649.tar.gz
linux-stable-b761c0ca2e964a240d74e50da9e27dc0b3be0649.tar.bz2
linux-stable-b761c0ca2e964a240d74e50da9e27dc0b3be0649.zip
ASoC: Free memory in the error paths of soc_of_parse_audio_routing()
Release the memory of the routing table before leaving the function upon errors in the device tree Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 64b464ca3bc5..f219b2f7ee68 100644
--- a/sound/soc/soc-core.c
+++ b/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;
}
}