Date: Wed, 4 Feb 2009 13:51:46 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 157137 for review Message-ID: <200902041351.n14Dpk3m031469@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=157137 Change 157137 by hselasky@hselasky_laptop001 on 2009/02/04 13:50:49 USB ethernet patch: - Make function definition match prototype. - Clear control request destination buffer in all error cases. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#9 (text+ko) ==== @@ -315,21 +315,25 @@ usb2_error_t usb2_ether_do_request(struct usb2_ether *ue, struct usb2_device_request *req, void *data, - uint32_t timeout) + unsigned int timeout) { uint16_t len; usb2_error_t err; + /* get request data length */ + len = UGETW(req->wLength); + /* check if the device is being detached */ - if (usb2_proc_is_gone(&ue->ue_tq)) - return (USB_ERR_IOERROR); + if (usb2_proc_is_gone(&ue->ue_tq)) { + err = USB_ERR_IOERROR; + goto done; + } - len = UGETW(req->wLength); - /* do the USB request */ err = usb2_do_request_flags(ue->ue_udev, ue->ue_mtx, req, data, 0, NULL, timeout); +done: /* on failure we zero the data */ if (err && len && (req->bmRequestType & UE_DIR_IN)) memset(data, 0, len);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902041351.n14Dpk3m031469>