Module Name: src Committed By: martin Date: Wed Feb 11 14:38:25 UTC 2015
Modified Files: src/sys/dev/usb [netbsd-6-0]: usbdi.c Log Message: Pull up following revision(s) (requested by aymeric in ticket #1250): sys/dev/usb/usbdi.c: revision 1.163 clip xfer->actlen also in the !DIAGNOSTIC case To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.134.8.1 src/sys/dev/usb/usbdi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/usbdi.c diff -u src/sys/dev/usb/usbdi.c:1.134 src/sys/dev/usb/usbdi.c:1.134.8.1 --- src/sys/dev/usb/usbdi.c:1.134 Sun Nov 27 03:25:00 2011 +++ src/sys/dev/usb/usbdi.c Wed Feb 11 14:38:25 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.134 2011/11/27 03:25:00 jmcneill Exp $ */ +/* $NetBSD: usbdi.c,v 1.134.8.1 2015/02/11 14:38:25 martin Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */ /* @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134 2011/11/27 03:25:00 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.134.8.1 2015/02/11 14:38:25 martin Exp $"); #include "opt_compat_netbsd.h" #include "opt_usb.h" @@ -780,13 +780,13 @@ usb_transfer_complete(usbd_xfer_handle x if (!(xfer->flags & USBD_NO_COPY) && xfer->actlen != 0 && usbd_xfer_isread(xfer)) { -#ifdef DIAGNOSTIC if (xfer->actlen > xfer->length) { +#ifdef DIAGNOSTIC printf("usb_transfer_complete: actlen > len %d > %d\n", xfer->actlen, xfer->length); +#endif xfer->actlen = xfer->length; } -#endif memcpy(xfer->buffer, KERNADDR(dmap, 0), xfer->actlen); }