CVS commit: [netbsd-5-1] src/sys/dev/usb

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Feb 11 15:40:38 UTC 2015

Modified Files:
src/sys/dev/usb [netbsd-5-1]: usbdi.c

Log Message:
Pull up following revision(s) (requested by aymeric in ticket #1948):
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.124.4.2 -r1.124.4.2.2.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.124.4.2 src/sys/dev/usb/usbdi.c:1.124.4.2.2.1
--- src/sys/dev/usb/usbdi.c:1.124.4.2	Wed Jan 27 20:56:45 2010
+++ src/sys/dev/usb/usbdi.c	Wed Feb 11 15:40:38 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.124.4.2 2010/01/27 20:56:45 sborrill Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.124.4.2.2.1 2015/02/11 15:40:38 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.124.4.2 2010/01/27 20:56:45 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.124.4.2.2.1 2015/02/11 15:40:38 martin Exp $);
 
 #include opt_compat_netbsd.h
 
@@ -773,13 +773,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);
 	}
 

CVS commit: [netbsd-5-1] src/sys/dev/usb

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sun Jan 13 16:30:16 UTC 2013

Modified Files:
src/sys/dev/usb [netbsd-5-1]: ubsa_common.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1830):
sys/dev/usb/ubsa_common.c: revision 1.9
Fix off by one read error.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.22.1 src/sys/dev/usb/ubsa_common.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/ubsa_common.c
diff -u src/sys/dev/usb/ubsa_common.c:1.4 src/sys/dev/usb/ubsa_common.c:1.4.22.1
--- src/sys/dev/usb/ubsa_common.c:1.4	Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/ubsa_common.c	Sun Jan 13 16:30:16 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ubsa_common.c,v 1.4 2008/05/24 16:40:58 cube Exp $	*/
+/*	$NetBSD: ubsa_common.c,v 1.4.22.1 2013/01/13 16:30:16 bouyer Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev kan.FreeBSD.org.
  * All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ubsa_common.c,v 1.4 2008/05/24 16:40:58 cube Exp $);
+__KERNEL_RCSID(0, $NetBSD: ubsa_common.c,v 1.4.22.1 2013/01/13 16:30:16 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -112,7 +112,7 @@ ubsa_request(struct ubsa_softc *sc, int 
 	else
 		req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 
-	if (portno  UBSA_MAXCONN) {
+	if (portno = UBSA_MAXCONN) {
 		printf(%s: ubsa_request: invalid port(%d)#\n,
 			USBDEVNAME(sc-sc_dev), portno);
 		return USBD_INVAL;