diff options
author | Chuansheng Liu <chuansheng.liu@intel.com> | 2012-12-26 00:56:05 +0800 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-27 16:14:43 +0000 |
commit | 865df9cb122d9e5ecbbb7056f2c9c64933bf8dd0 (patch) | |
tree | 39e8c354c99d0118c037bfb4ac503046c2ce2ad7 /sound | |
parent | 5db1bc1892aa70d378ea7563852ae87f3772519b (diff) | |
download | linux-3.10-865df9cb122d9e5ecbbb7056f2c9c64933bf8dd0.tar.gz linux-3.10-865df9cb122d9e5ecbbb7056f2c9c64933bf8dd0.tar.bz2 linux-3.10-865df9cb122d9e5ecbbb7056f2c9c64933bf8dd0.zip |
ASoC: core: fix the memory leak in case of device_add() failure
After called device_initialize(), even device_add() returns
error, we still need use the put_device() to release the reference
to call rtd_release(), which will do the free() action.
Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 29046e750ad..f7551c1c827 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1255,6 +1255,8 @@ static int soc_post_component_init(struct snd_soc_card *card, INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_CAPTURE].fe_clients); ret = device_add(rtd->dev); if (ret < 0) { + /* calling put_device() here to free the rtd->dev */ + put_device(rtd->dev); dev_err(card->dev, "ASoC: failed to register runtime device: %d\n", ret); return ret; |