Commit a65421ea authored by Stefan Richter's avatar Stefan Richter

ieee1394: fix another deadlock in nodemgr

A "modprobe ohci1394; sleep 1.5; modprobe -r ohci1394" could get stuck
in uninterruptible state, especially if an external node was connected.
http://bugzilla.kernel.org/show_bug.cgi?id=7792Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 3dc5ea9b
...@@ -1681,7 +1681,8 @@ static int nodemgr_host_thread(void *__hi) ...@@ -1681,7 +1681,8 @@ static int nodemgr_host_thread(void *__hi)
for (;;) { for (;;) {
/* Sleep until next bus reset */ /* Sleep until next bus reset */
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
if (get_hpsb_generation(host) == generation) if (get_hpsb_generation(host) == generation &&
!kthread_should_stop())
schedule(); schedule();
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment