Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1048 → Rev 1049

/shark/trunk/drivers/usb/core/hcd.c
1168,6 → 1168,7
struct device *sys = 0;
unsigned long flags;
struct completion_splice splice;
struct list_head *tmp; /* 2.6.1 */
int retval;
 
if (!urb)
1206,10 → 1207,22
*/
WARN_ON (!HCD_IS_RUNNING (hcd->state) && hcd->state != USB_STATE_HALT);
 
/* insist the urb is still queued */
list_for_each(tmp, &dev->urb_list) {
if (tmp == &urb->urb_list)
break;
}
if (tmp != &urb->urb_list) {
retval = -EINVAL;
goto done;
}
 
/* removed for 2.6.1
if (!urb->hcpriv) {
retval = -EINVAL;
goto done;
}
*/
 
/* Any status except -EINPROGRESS means something already started to
* unlink this URB from the hardware. So there's no more work to do.