Module Name: src
Committed By: bouyer
Date: Mon Apr 9 13:25:36 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: if_rtwn.c
Log Message:
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:
To generate a diff of this commit:
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/sys/dev/pci/if_rtwn.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/pci/if_rtwn.c
diff -u src/sys/dev/pci/if_rtwn.c:1.12.2.1 src/sys/dev/pci/if_rtwn.c:1.12.2.2
--- src/sys/dev/pci/if_rtwn.c:1.12.2.1 Sun Dec 10 10:10:24 2017
+++ src/sys/dev/pci/if_rtwn.c Mon Apr 9 13:25:36 2018
@@ -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 @@ rtwn_attach(device_t parent, device_t se
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
+ return;
+
fail:
rtwn_detach(self, 0);
}
