summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorBorislav Petkov <bbpetkov@yahoo.de>2007-10-22 17:11:09 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-23 08:07:55 +0200
commit7507e8da2f21476007501f04d8bce2b7d0cb3971 (patch)
tree97dfb3efdfda3ee3c9402e52191b722c186e83e7 /sound
parent31127f2eb945f092010a457c65260b0e19471cc5 (diff)
downloadop-kernel-dev-7507e8da2f21476007501f04d8bce2b7d0cb3971.zip
op-kernel-dev-7507e8da2f21476007501f04d8bce2b7d0cb3971.tar.gz
[ALSA] sound/core/control.c: hard-irq-safe -> hard-irq-unsafe lock warning
The lock grabbed in snd_ctl_empty_read_queue() is hardirq-unsafe but we hold an hardirq-safe one already, so make the &ctl->read_lock also hard-irq-safe. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/control.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/control.c b/sound/core/control.c
index 4c3aa8e..df0774c 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -93,15 +93,16 @@ static int snd_ctl_open(struct inode *inode, struct file *file)
static void snd_ctl_empty_read_queue(struct snd_ctl_file * ctl)
{
+ unsigned long flags;
struct snd_kctl_event *cread;
- spin_lock(&ctl->read_lock);
+ spin_lock_irqsave(&ctl->read_lock, flags);
while (!list_empty(&ctl->events)) {
cread = snd_kctl_event(ctl->events.next);
list_del(&cread->list);
kfree(cread);
}
- spin_unlock(&ctl->read_lock);
+ spin_unlock_irqrestore(&ctl->read_lock, flags);
}
static int snd_ctl_release(struct inode *inode, struct file *file)
OpenPOWER on IntegriCloud