Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Improve error handling in attach code. From t-hash.



details:   https://anonhg.NetBSD.org/src/rev/e8b07285432a
branches:  trunk
changeset: 340322:e8b07285432a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Aug 31 10:41:22 2015 +0000

description:
Improve error handling in attach code. From t-hash.

diffstat:

 sys/dev/pci/ehci_pci.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r cbe038e51d18 -r e8b07285432a sys/dev/pci/ehci_pci.c
--- a/sys/dev/pci/ehci_pci.c    Mon Aug 31 09:34:07 2015 +0000
+++ b/sys/dev/pci/ehci_pci.c    Mon Aug 31 10:41:22 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci_pci.c,v 1.61 2015/08/19 06:16:18 skrll Exp $      */
+/*     $NetBSD: ehci_pci.c,v 1.62 2015/08/31 10:41:22 skrll Exp $      */
 
 /*
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.61 2015/08/19 06:16:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.62 2015/08/31 10:41:22 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -183,7 +183,7 @@
                if (intrstr != NULL)
                        aprint_error(" at %s", intrstr);
                aprint_error("\n");
-               return;
+               goto fail;
        }
        aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 
@@ -193,7 +193,7 @@
        case PCI_USBREV_1_1:
                sc->sc.sc_bus.usbrev = USBREV_UNKNOWN;
                aprint_verbose_dev(self, "pre-2.0 USB rev\n");
-               return;
+               goto fail;
        case PCI_USBREV_2_0:
                sc->sc.sc_bus.usbrev = USBREV_2_0;
                break;



Home | Main Index | Thread Index | Old Index