[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080923180008.GA11701@localhost.localdomain>
Date: Tue, 23 Sep 2008 20:00:08 +0200
From: Vegard Nossum <vegard.nossum@...il.com>
To: Takashi Iwai <tiwai@...e.de>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Edgar Kalkowski <eMail@...ar-kalkowski.de>,
linux-kernel@...r.kernel.org
Subject: [PATCH] sound: use the right lock in snd_ctl_dev_disconnect
Hi,
I never saw any follow-up on this, so here's the patch (in case it was
simply forgotten). Please ignore if it has already been applied to some
development tree. Compile-tested only.
Vegard
>From 14865508117c3727d2c11569201bef6fbcaeb434 Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@...il.com>
Date: Tue, 23 Sep 2008 19:50:48 +0200
Subject: [PATCH] sound: use the right lock in snd_ctl_dev_disconnect
&card->ctl_files is protected by &card->ctl_files_rwlock, not
&card->controls_rwsem. Fix it.
Signed-off-by: Vegard Nossum <vegard.nossum@...il.com>
---
sound/core/control.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/core/control.c b/sound/core/control.c
index 281b2e2..236bbb1 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1427,12 +1427,12 @@ static int snd_ctl_dev_disconnect(struct snd_device *device)
cardnum = card->number;
snd_assert(cardnum >= 0 && cardnum < SNDRV_CARDS, return -ENXIO);
- down_read(&card->controls_rwsem);
+ read_lock(&card->ctl_files_rwlock);
list_for_each_entry(ctl, &card->ctl_files, list) {
wake_up(&ctl->change_sleep);
kill_fasync(&ctl->fasync, SIGIO, POLL_ERR);
}
- up_read(&card->controls_rwsem);
+ read_unlock(&card->ctl_files_rwlock);
if ((err = snd_unregister_device(SNDRV_DEVICE_TYPE_CONTROL,
card, -1)) < 0)
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists