---

yaml --- r: 367086 b: refs/heads/master c: 5f3f254 h: refs/heads/master v: v3
git-mirror · Apr 23, 2013 · 34a2c35 · 34a2c35
1 parent 960e5d9
commit 34a2c35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d54ba0e37130edda335e7f373f193014ede2a12
+refs/heads/master: 5f3f254f7c138a22a544b80ce2c14a3fc4ed711e
diff --git a/trunk/drivers/media/rc/imon.c b/trunk/drivers/media/rc/imon.c
@@ -528,8 +528,10 @@ static int send_packet(struct imon_context *ictx)
 		mutex_unlock(&ictx->lock);
 		retval = wait_for_completion_interruptible(
 				&ictx->tx.finished);
-		if (retval)
+		if (retval) {
+			usb_kill_urb(ictx->tx_urb);
 			pr_err_ratelimited("task interrupted\n");
+		}
 		mutex_lock(&ictx->lock);
 
 		retval = ictx->tx.status;