Module Name: src
Committed By: christos
Date: Sat Jul 10 04:09:36 UTC 2010
Modified Files:
src/sys/dev/pci: if_iwn.c
Log Message:
V() the mutex when firmware is initialized, duh!
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_iwn.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_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.48 src/sys/dev/pci/if_iwn.c:1.49
--- src/sys/dev/pci/if_iwn.c:1.48 Sat Jul 3 17:43:37 2010
+++ src/sys/dev/pci/if_iwn.c Sat Jul 10 00:09:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.48 2010/07/03 21:43:37 christos Exp $ */
+/* $NetBSD: if_iwn.c,v 1.49 2010/07/10 04:09:35 christos Exp $ */
/* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.48 2010/07/03 21:43:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.49 2010/07/10 04:09:35 christos Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -5844,7 +5844,7 @@
mutex_enter(&sc->sc_mtx);
if (sc->sc_flags & IWN_FLAG_HW_INITED)
- return 0;
+ goto out;
if ((error = iwn_hw_prepare(sc)) != 0) {
aprint_error_dev(sc->sc_dev,
"hardware not ready\n");
@@ -5898,6 +5898,7 @@
ieee80211_new_state(ic, IEEE80211_S_RUN, -1);
sc->sc_flags |= IWN_FLAG_HW_INITED;
+out:
mutex_exit(&sc->sc_mtx);
return 0;
