|
@@ -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];
|