aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorSilviu-Mihai Popescu <silviupopescu1990@gmail.com>2013-03-16 07:45:34 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-20 06:05:56 -0400
commitf7ba716f1e704a00d682a8697108f9c86497c551 (patch)
tree29ad6e35139a06673b4653926f649302b284a2d8 /sound
parente8b18addee32d1f389573b4c116e67ae230216ad (diff)
ASoC: core: fix invalid free of devm_ allocated data
The objects allocated by devm_* APIs are managed by devres and are freed when the device is detached. Hence there is no need to use kfree() explicitly. Signed-off-by: Silviu-Mihai Popescu <silviupopescu1990@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 93341deaa4b9..507d251916af 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4199,7 +4199,6 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
4199 dev_err(card->dev, 4199 dev_err(card->dev,
4200 "ASoC: Property '%s' index %d could not be read: %d\n", 4200 "ASoC: Property '%s' index %d could not be read: %d\n",
4201 propname, 2 * i, ret); 4201 propname, 2 * i, ret);
4202 kfree(routes);
4203 return -EINVAL; 4202 return -EINVAL;
4204 } 4203 }
4205 ret = of_property_read_string_index(np, propname, 4204 ret = of_property_read_string_index(np, propname,
@@ -4208,7 +4207,6 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
4208 dev_err(card->dev, 4207 dev_err(card->dev,
4209 "ASoC: Property '%s' index %d could not be read: %d\n", 4208 "ASoC: Property '%s' index %d could not be read: %d\n",
4210 propname, (2 * i) + 1, ret); 4209 propname, (2 * i) + 1, ret);
4211 kfree(routes);
4212 return -EINVAL; 4210 return -EINVAL;
4213 } 4211 }
4214 } 4212 }