From fc3ba4540484905b7aac56a60588ef649cfce920 Mon Sep 17 00:00:00 2001 From: Arvid Brodin Date: Fri, 17 Jun 2011 18:45:37 +0200 Subject: [PATCH] --- yaml --- r: 254161 b: refs/heads/master c: 8b1ab60c767f33d79894ef66037ef851a7a88fc8 h: refs/heads/master i: 254159: 4444fdba108029b8874bdfa49e9b4db59cc78299 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/isp1760-hcd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c8819160649c..07c8865a80b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95a2424ff9221624c3944f3732f6cfacbb522ae4 +refs/heads/master: 8b1ab60c767f33d79894ef66037ef851a7a88fc8 diff --git a/trunk/drivers/usb/host/isp1760-hcd.c b/trunk/drivers/usb/host/isp1760-hcd.c index c9e6e454c625..55d3d5859ac5 100644 --- a/trunk/drivers/usb/host/isp1760-hcd.c +++ b/trunk/drivers/usb/host/isp1760-hcd.c @@ -1555,7 +1555,7 @@ static void kill_transfer(struct usb_hcd *hcd, struct urb *urb, /* We need to forcefully reclaim the slot since some transfers never return, e.g. interrupt transfers and NAKed bulk transfers. */ - if (usb_pipebulk(urb->pipe)) { + if (usb_pipecontrol(urb->pipe) || usb_pipebulk(urb->pipe)) { skip_map = reg_read32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG); skip_map |= (1 << qh->slot); reg_write32(hcd->regs, HC_ATL_PTD_SKIPMAP_REG, skip_map);