--- x/drivers/media/rc/imon.c
+++ y/drivers/media/rc/imon.c
@@ -646,15 +646,15 @@ static int send_packet(struct imon_conte
 		pr_err_ratelimited("error submitting urb(%d)\n", retval);
 	} else {
 		/* Wait for transmission to complete (or abort) */
-		retval = wait_for_completion_interruptible(
-				&ictx->tx.finished);
-		if (retval) {
+		long rc = wait_for_completion_interruptible_timeout(&ictx->tx.finished, 60*HZ);
+		if (rc <= 0) {
 			usb_kill_urb(ictx->tx_urb);
 			pr_err_ratelimited("task interrupted\n");
-		}
+			retval = rc ? -EINTR : -ETIMEDOUT;
+		} else
+			retval = ictx->tx.status;
 
 		ictx->tx.busy = false;
-		retval = ictx->tx.status;
 		if (retval)
 			pr_err_ratelimited("packet tx failed (%d)\n", retval);
 	}
@@ -1765,6 +1765,7 @@ static void usb_rx_callback_intf0(struct
 		break;
 
 	default:
+		return;
 		dev_warn(ictx->dev, "imon %s: status(%d): ignored\n",
 			 __func__, urb->status);
 		break;
@@ -1806,6 +1807,7 @@ static void usb_rx_callback_intf1(struct
 		break;
 
 	default:
+		return;
 		dev_warn(ictx->dev, "imon %s: status(%d): ignored\n",
 			 __func__, urb->status);
 		break;