projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cando' into for-linus
[linux-2.6-microblaze.git]
/
drivers
/
staging
/
usbip
/
usbip_event.c
diff --git
a/drivers/staging/usbip/usbip_event.c
b/drivers/staging/usbip/usbip_event.c
index
6da1021
..
a2566f1
100644
(file)
--- a/
drivers/staging/usbip/usbip_event.c
+++ b/
drivers/staging/usbip/usbip_event.c
@@
-117,6
+117,9
@@
void usbip_stop_eh(struct usbip_device *ud)
{
struct usbip_task *eh = &ud->eh;
+ if (eh->thread == current)
+ return; /* do not wait for myself */
+
wait_for_completion(&eh->thread_done);
usbip_dbg_eh("usbip_eh has finished\n");
}