From d13b7080afbe1ece1281e30493e3d1389af8bd07 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 14 Mar 2012 20:18:49 +0000 Subject: [PATCH] --- yaml --- r: 293511 b: refs/heads/master c: 181a68927b9e6ff7c0ea093c2f056eeb0552a911 h: refs/heads/master i: 293509: 3ef883b91209ba120390834f5fdd967ba680df23 293507: 506a378f10338e93cb2a68aea74d4328dcb486db 293503: f9b1b15ddb15c7729753e1c2bfa93518d15e8746 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-core.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 88a000e2208c..0738a1dbddad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eb98f45b77b00868dcebe4a0f00d2a36afd88c2 +refs/heads/master: 181a68927b9e6ff7c0ea093c2f056eeb0552a911 diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 93a0daac5088..a4deebc0801a 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -1686,7 +1686,6 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) snd_soc_dapm_free(&card->dapm); - kfree(card->rtd); snd_card_free(card->snd_card); return 0; @@ -3112,9 +3111,10 @@ int snd_soc_register_card(struct snd_soc_card *card) soc_init_card_debugfs(card); - card->rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime) * - (card->num_links + card->num_aux_devs), - GFP_KERNEL); + card->rtd = devm_kzalloc(card->dev, + sizeof(struct snd_soc_pcm_runtime) * + (card->num_links + card->num_aux_devs), + GFP_KERNEL); if (card->rtd == NULL) return -ENOMEM; card->rtd_aux = &card->rtd[card->num_links];