From 34a2c3587f94cd6325b55289b2d12fad0f287c25 Mon Sep 17 00:00:00 2001 From: Kevin Baradon Date: Mon, 22 Apr 2013 16:09:46 -0300 Subject: [PATCH] --- yaml --- r: 367086 b: refs/heads/master c: 5f3f254f7c138a22a544b80ce2c14a3fc4ed711e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/imon.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a7651592798c..64993871e6b1 100644 --- 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 index 3af7bb6c9f30..72e3fa652481 100644 --- 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;