Module Name: src
Committed By: joerg
Date: Tue Jun 12 20:25:59 UTC 2012
Modified Files:
src/sys/dev/usb: stuirda.c
Log Message:
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.14 -r1.15 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.14 src/sys/dev/usb/stuirda.c:1.15
--- src/sys/dev/usb/stuirda.c:1.14 Tue Mar 6 03:35:29 2012
+++ src/sys/dev/usb/stuirda.c Tue Jun 12 20:25:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: stuirda.c,v 1.14 2012/03/06 03:35:29 mrg Exp $ */
+/* $NetBSD: stuirda.c,v 1.15 2012/06/12 20:25:58 joerg 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.14 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.15 2012/06/12 20:25:58 joerg 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);
