From e613b68515f8bba9f893c449e8cc0c8387a18393 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 23 Jan 2006 17:17:21 -0500
Subject: [PATCH] --- yaml --- r: 19225 b: refs/heads/master c:
 e9aa795aaed0b861aaa5a8075748c9c34e2620ee h: refs/heads/master i:   19223:
 187e491cde3045345b8890ae97c0503c7a5df54d v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/usb/core/urb.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4a6dac8ad21b..fe29d0589d35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 682d4c803f646d2ce09fde9ed7e99015598c3298
+refs/heads/master: e9aa795aaed0b861aaa5a8075748c9c34e2620ee
diff --git a/trunk/drivers/usb/core/urb.c b/trunk/drivers/usb/core/urb.c
index 081796726b95..dad4d8fd8180 100644
--- a/trunk/drivers/usb/core/urb.c
+++ b/trunk/drivers/usb/core/urb.c
@@ -468,6 +468,7 @@ int usb_unlink_urb(struct urb *urb)
  */
 void usb_kill_urb(struct urb *urb)
 {
+	might_sleep();
 	if (!(urb && urb->dev && urb->dev->bus && urb->dev->bus->op))
 		return;
 	spin_lock_irq(&urb->lock);