Module Name: src
Committed By: sborrill
Date: Fri Jun 15 11:22:08 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-6]: stuirda.c
Log Message:
Pull up the following revisions(s) (requested by joerg in ticket #336):
sys/dev/usb/stuirda.c: revision 1.15
Fix a case where an uninitialized USB pipe could be freed in the error
path.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/dev/usb/stuirda.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/stuirda.c
diff -u src/sys/dev/usb/stuirda.c:1.13 src/sys/dev/usb/stuirda.c:1.13.2.1
--- src/sys/dev/usb/stuirda.c:1.13 Fri Dec 23 00:51:44 2011
+++ src/sys/dev/usb/stuirda.c Fri Jun 15 11:22:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: stuirda.c,v 1.13 2011/12/23 00:51:44 jakllsch Exp $ */
+/* $NetBSD: stuirda.c,v 1.13.2.1 2012/06/15 11:22:07 sborrill Exp $ */
/*
* Copyright (c) 2001,2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.13 2011/12/23 00:51:44 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.13.2.1 2012/06/15 11:22:07 sborrill Exp $");
#include <sys/param.h>
@@ -220,7 +220,7 @@ stuirda_fwload(struct uirda_softc *sc) {
if (rc) {
printf("%s: Cannot switch to f/w d/l mode, error %d\n",
device_xname(sc->sc_dev), rc);
- goto giveup4;
+ goto giveup3;
}
delay(100000);
