Skip to content

Commit

Permalink
USB: remove unnecessary tests in isp116x and sl811
Browse files Browse the repository at this point in the history
This patch (as962) cleans up some code I forgot to remove earlier in
the isp116x and sl811 HCDs.  There is no longer any need to check for
unlink-during-submit; it can't happen since the endpoint queues are
now under the protection of the HCD-private spinlock.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: David Brownell <david-b@pacbell.net>
CC: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Oct 12, 2007
1 parent f311cf5 commit e39ab59
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
6 changes: 0 additions & 6 deletions drivers/usb/host/isp116x-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -815,12 +815,6 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
}
}

/* in case of unlink-during-submit */
if (urb->status != -EINPROGRESS) {
finish_request(isp116x, ep, urb);
ret = 0;
goto fail;
}
urb->hcpriv = hep;
start_atl_transfers(isp116x);

Expand Down
10 changes: 0 additions & 10 deletions drivers/usb/host/sl811-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -957,17 +957,7 @@ static int sl811h_urb_enqueue(
sofirq_on(sl811);
}

/* in case of unlink-during-submit */
spin_lock(&urb->lock);
if (urb->status != -EINPROGRESS) {
spin_unlock(&urb->lock);
finish_request(sl811, ep, urb, 0);
retval = 0;
goto fail;
}
urb->hcpriv = hep;
spin_unlock(&urb->lock);

start_transfer(sl811);
sl811_write(sl811, SL11H_IRQ_ENABLE, sl811->irq_enable);
fail:
Expand Down

0 comments on commit e39ab59

Please sign in to comment.