This has two minor tweaks to the uhci-hcd driver: - removes some duplicated code (HCD framework does that test) - corrects a FIXME comment (no issue)
Appropriate for merging to Linus' latest. - Dave
--- ./drivers/usb-dist/host/uhci-hcd.c Mon Jun 3 11:11:11 2002 +++ ./drivers/usb/host/uhci-hcd.c Wed Jun 5 09:51:56 2002 @@ -1502,10 +1502,6 @@ break; case PIPE_ISOCHRONOUS: if (urb->bandwidth == 0) { /* not yet checked/allocated */ - if (urb->number_of_packets <= 0) { - ret = -EINVAL; - break; - } bustime = usb_check_bandwidth(urb->dev, urb); if (bustime < 0) { ret = bustime; --- ./drivers/usb-dist/host/uhci-hub.c Mon Jun 3 11:11:11 2002 +++ ./drivers/usb/host/uhci-hub.c Wed Jun 5 09:57:47 2002 @@ -52,7 +52,7 @@ outw(status, io_addr + USBPORTSC1 + 2 * (wIndex-1)) -// FIXME: Shouldn't this return the length of the data too? +/* size of returned buffer is part of USB spec */ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex, char *buf, u16 wLength) {