[src/trunk]: src/sys/dev/usb Handle errors in ohci_open better.

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

details:   https://anonhg.NetBSD.org/src/rev/b1c85678d111
branches:  trunk
changeset: 785886:b1c85678d111
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Apr 04 13:28:57 2013 +0000

description:
Handle errors in ohci_open better.

diffstat:

 sys/dev/usb/ohci.c |  24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diffs (79 lines):

diff -r d892bea53aab -r b1c85678d111 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Thu Apr 04 13:27:55 2013 +0000
+++ b/sys/dev/usb/ohci.c        Thu Apr 04 13:28:57 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.240 2013/04/04 13:27:55 skrll Exp $ */
+/*     $NetBSD: ohci.c,v 1.241 2013/04/04 13:28:57 skrll Exp $ */
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.240 2013/04/04 13:27:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.241 2013/04/04 13:28:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2136,8 +2136,7 @@
                     pipe, addr, ed->bEndpointAddress, sc->sc_addr));
 
        if (sc->sc_dying) {
-               err = USBD_IOERROR;
-               goto bad0;
+               return USBD_IOERROR;
        }
 
        std = NULL;
@@ -2153,19 +2152,20 @@
                        break;
                default:
                        err = USBD_INVAL;
-                       goto bad0;
+                       goto bad;
                }
        } else {
                sed = ohci_alloc_sed(sc);
                if (sed == NULL)
-                       goto bad0;
+                       goto bad;
                opipe->sed = sed;
                if (xfertype == UE_ISOCHRONOUS) {
                        mutex_enter(&sc->sc_lock);
                        sitd = ohci_alloc_sitd(sc);
                        mutex_exit(&sc->sc_lock);
                        if (sitd == NULL)
-                               goto bad1;
+                               goto bad;
+
                        opipe->tail.itd = sitd;
                        tdphys = sitd->physaddr;
                        fmt = OHCI_ED_FORMAT_ISO;
@@ -2178,7 +2178,8 @@
                        std = ohci_alloc_std(sc);
                        mutex_exit(&sc->sc_lock);
                        if (std == NULL)
-                               goto bad1;
+                               goto bad;
+
                        opipe->tail.td = std;
                        tdphys = std->physaddr;
                        fmt = OHCI_ED_FORMAT_GEN | OHCI_ED_DIR_TD;
@@ -2231,12 +2232,13 @@
        return USBD_NORMAL_COMPLETION;
 
  bad:
-       if (std != NULL)
+       if (std != NULL) {
+               mutex_enter(&sc->sc_lock);
                ohci_free_std(sc, std);
- bad1:
+               mutex_exit(&sc->sc_lock);
+       }
        if (sed != NULL)
                ohci_free_sed(sc, sed);
- bad0:
        return err;
 
 }