[src/netbsd-6-0]: src/sys/dev/usb Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dd3847a56d0d
branches:  netbsd-6-0
changeset: 775045:dd3847a56d0d
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Feb 11 14:38:25 2015 +0000

description:
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

diffstat:

 sys/dev/usb/usbdi.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 0be5c075fc91 -r dd3847a56d0d sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Wed Feb 04 04:55:51 2015 +0000
+++ b/sys/dev/usb/usbdi.c       Wed Feb 11 14:38:25 2015 +0000
@@ -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 @@
 
        if (!(xfer->flags & USBD_NO_COPY) && xfer->actlen != 0 &&
            usbd_xfer_isread(xfer)) {
+               if (xfer->actlen > xfer->length) {
 #ifdef DIAGNOSTIC
-               if (xfer->actlen > xfer->length) {
                        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);
        }