mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiri Slaby <jslaby@suse.cz>
To: tiwai@suse.de
Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>,
	Jaroslav Kysela <perex@perex.cz>,
	alsa-devel@alsa-project.org
Subject: [PATCH 2/3] sound: dummy, use del_timer_sync
Date: Mon, 19 Jan 2015 10:42:55 +0100	[thread overview]
Message-ID: <1421660576-8435-2-git-send-email-jslaby@suse.cz> (raw)
In-Reply-To: <1421660576-8435-1-git-send-email-jslaby@suse.cz>

Wait for the timer to really quit, not only by ensuring it is not in
the critical section.

BTW the spin_lock in here does not disable BH, so that it could
deadlock.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
---
 sound/drivers/dummy.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index d11baaf0f0b4..6d6bf4093583 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -281,9 +281,9 @@ static int dummy_systimer_start(struct snd_pcm_substream *substream)
 static int dummy_systimer_stop(struct snd_pcm_substream *substream)
 {
 	struct dummy_systimer_pcm *dpcm = substream->runtime->private_data;
-	spin_lock(&dpcm->lock);
-	del_timer(&dpcm->timer);
-	spin_unlock(&dpcm->lock);
+
+	del_timer_sync(&dpcm->timer);
+
 	return 0;
 }
 
-- 
2.2.1


  reply	other threads:[~2015-01-19  9:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-19  9:42 [PATCH 1/3] sound: dummy, use setup_timer and mod_timer Jiri Slaby
2015-01-19  9:42 ` Jiri Slaby [this message]
2015-01-19  9:52   ` [PATCH 2/3] sound: dummy, use del_timer_sync Takashi Iwai
2015-01-19  9:59     ` Jiri Slaby
2015-01-19  9:42 ` [PATCH 3/3] sound: dummy, avoid races with timer Jiri Slaby
2015-01-19  9:49   ` Takashi Iwai
2015-01-19  9:53     ` Jiri Slaby
2015-01-19  9:56     ` [PATCH v2 2/2] sound: dummy, avoid race " Jiri Slaby
2015-01-19  9:59       ` Takashi Iwai
2015-01-19  9:53 ` [PATCH 1/3] sound: dummy, use setup_timer and mod_timer Takashi Iwai

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=1421660576-8435-2-git-send-email-jslaby@suse.cz \
    --to=jslaby@suse.cz \
    --cc=alsa-devel@alsa-project.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --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

all inboxes | Powered by JetHome®