From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752178AbbASJnD (ORCPT ); Mon, 19 Jan 2015 04:43:03 -0500 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:39213 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752014AbbASJm6 (ORCPT ); Mon, 19 Jan 2015 04:42:58 -0500 From: Jiri Slaby To: tiwai@suse.de Cc: linux-kernel@vger.kernel.org, Jiri Slaby , Jaroslav Kysela , alsa-devel@alsa-project.org Subject: [PATCH 2/3] sound: dummy, use del_timer_sync Date: Mon, 19 Jan 2015 10:42:55 +0100 Message-Id: <1421660576-8435-2-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1421660576-8435-1-git-send-email-jslaby@suse.cz> References: <1421660576-8435-1-git-send-email-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Jaroslav Kysela Cc: Takashi Iwai 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