lkml.org 
[lkml]   [2012]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Sound+USB: deadlock problem
At Tue, 13 Nov 2012 09:30:10 +0100,
Jiri Slaby wrote:
>
> On 11/13/2012 09:28 AM, Takashi Iwai wrote:
> > At Tue, 13 Nov 2012 09:26:17 +0100,
> > Jiri Slaby wrote:
> >>
> >> Hello,
> >>
> >> I've just plugged+unplugged+plugged my USB audio card and the audio
> >> subsystem got stuck:
> >
> > Which kernel? If it's older than 3.7-rc5, could you try 3.7-rc5?
>
> Oh, forgot to mention:
> 3.7.0-rc5-next-20121112_64+

Through a quick glance, one of mutex locks seems stuck.
Just a blind short -- does the patch below cure the problem?


thanks,

Takashi

---
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 030102c..a66a7ca 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -1086,7 +1086,7 @@ static int snd_pcm_dev_disconnect(struct snd_device *device)
if (list_empty(&pcm->list))
goto unlock;

- mutex_lock(&pcm->open_mutex);
+ /* mutex_lock(&pcm->open_mutex); */
wake_up(&pcm->open_wait);
list_del_init(&pcm->list);
for (cidx = 0; cidx < 2; cidx++)
@@ -1118,7 +1118,7 @@ static int snd_pcm_dev_disconnect(struct snd_device *device)
pcm->streams[cidx].chmap_kctl = NULL;
}
}
- mutex_unlock(&pcm->open_mutex);
+ /* mutex_unlock(&pcm->open_mutex); */
unlock:
mutex_unlock(&register_mutex);
return 0;

\
 
 \ /
  Last update: 2012-11-13 10:21    [W:0.051 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site