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

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

details:   https://anonhg.NetBSD.org/src/rev/7b090dc40039
branches:  netbsd-7
changeset: 798975:7b090dc40039
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Feb 11 09:32:19 2015 +0000

description:
Pull up following revision(s) (requested by aymeric in ticket #505):
        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 fe7de6d4a42b -r 7b090dc40039 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Wed Feb 11 08:37:00 2015 +0000
+++ b/sys/dev/usb/usbdi.c       Wed Feb 11 09:32:19 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.161 2014/08/05 06:35:24 skrll Exp $        */
+/*     $NetBSD: usbdi.c,v 1.161.2.1 2015/02/11 09:32:19 martin Exp $   */
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.161 2014/08/05 06:35:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.161.2.1 2015/02/11 09:32:19 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -806,13 +806,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("%s: actlen (%d) > len (%d)\n", __func__,
                               xfer->actlen, xfer->length);
+#endif
                        xfer->actlen = xfer->length;
                }
-#endif
                memcpy(xfer->buffer, KERNADDR(dmap, 0), xfer->actlen);
        }