Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: clemens@ladisch.de, tiwai@suse.de
Cc: alsa-devel@alsa-project.org, ffado-devel@lists.sf.net
Subject: Re: [PATCH] ALSA: dice: fix memory leak when unplugging
Date: Mon, 28 Mar 2016 08:25:49 +0900	[thread overview]
Message-ID: <56F86BFD.2000902@sakamocchi.jp> (raw)
In-Reply-To: <1459121012-6006-1-git-send-email-o-takashi@sakamocchi.jp>

On Mar 28 2016 08:23, Takashi Sakamoto wrote:
> When sound card is going to be released, dice private data is
> also released. Then all of data should be released. However,
> stream data is not released. This causes memory leak when
> unplugging dice unit.
> 
> This commit fixes the bug.
> 
> Fixes: 4bdc495c87b3('ALSA: dice: handle several PCM substreams when any isochronous streams are available')

Oops. I forgot to add 'Signed-off-by'. Please drop this...

> ---
>  sound/firewire/dice/dice-stream.c | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c
> index 845d5e5..ec4db3a 100644
> --- a/sound/firewire/dice/dice-stream.c
> +++ b/sound/firewire/dice/dice-stream.c
> @@ -446,18 +446,12 @@ end:
>  
>  void snd_dice_stream_destroy_duplex(struct snd_dice *dice)
>  {
> -	struct reg_params tx_params, rx_params;
> -
> -	snd_dice_transaction_clear_enable(dice);
> +	unsigned int i;
>  
> -	if (get_register_params(dice, &tx_params, &rx_params) == 0) {
> -		stop_streams(dice, AMDTP_IN_STREAM, &tx_params);
> -		stop_streams(dice, AMDTP_OUT_STREAM, &rx_params);
> +	for (i = 0; i < MAX_STREAMS; i++) {
> +		destroy_stream(dice, AMDTP_IN_STREAM, i);
> +		destroy_stream(dice, AMDTP_OUT_STREAM, i);
>  	}
> -
> -	release_resources(dice);
> -
> -	dice->substreams_counter = 0;
>  }
>  
>  void snd_dice_stream_update_duplex(struct snd_dice *dice)
> 

      reply	other threads:[~2016-03-27 23:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-27 23:23 [PATCH] ALSA: dice: fix memory leak when unplugging Takashi Sakamoto
2016-03-27 23:25 ` Takashi Sakamoto [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56F86BFD.2000902@sakamocchi.jp \
    --to=o-takashi@sakamocchi.jp \
    --cc=alsa-devel@alsa-project.org \
    --cc=clemens@ladisch.de \
    --cc=ffado-devel@lists.sf.net \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox