[src/netbsd-6]: src/sys/dev/usb Pull up the following revisions(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/8e2ec7ae1c76
branches:  netbsd-6
changeset: 774235:8e2ec7ae1c76
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Fri Jun 15 11:22:07 2012 +0000

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

diffstat:

 sys/dev/usb/stuirda.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 56f5bafa2b91 -r 8e2ec7ae1c76 sys/dev/usb/stuirda.c
--- a/sys/dev/usb/stuirda.c     Fri Jun 15 10:00:29 2012 +0000
+++ b/sys/dev/usb/stuirda.c     Fri Jun 15 11:22:07 2012 +0000
@@ -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 @@
        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);