[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/010729c01112
branches:  netbsd-8
changeset: 434848:010729c01112
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Apr 09 13:25:36 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #719):
        sys/dev/pci/if_rtwn.c: revision 1.15
in rtwn_attach(): return; before unconditionally running into fail:

diffstat:

 sys/dev/pci/if_rtwn.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 1fc37c342fbc -r 010729c01112 sys/dev/pci/if_rtwn.c
--- a/sys/dev/pci/if_rtwn.c     Mon Apr 09 13:23:29 2018 +0000
+++ b/sys/dev/pci/if_rtwn.c     Mon Apr 09 13:25:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_rtwn.c,v 1.12.2.1 2017/12/10 10:10:24 snj Exp $     */
+/*     $NetBSD: if_rtwn.c,v 1.12.2.2 2018/04/09 13:25:36 bouyer Exp $  */
 /*     $OpenBSD: if_rtwn.c,v 1.5 2015/06/14 08:02:47 stsp Exp $        */
 #define        IEEE80211_NO_HT
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.12.2.1 2017/12/10 10:10:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.12.2.2 2018/04/09 13:25:36 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -396,6 +396,8 @@
        if (!pmf_device_register(self, NULL, NULL))
                aprint_error_dev(self, "couldn't establish power handler\n");
 
+       return;
+
 fail:
        rtwn_detach(self, 0);
 }