Author: bschmidt
Date: Tue Dec 21 09:13:24 2010
New Revision: 216608
URL: http://svn.freebsd.org/changeset/base/216608
Log:
Fix a panic while disabling the RF kill button, caller of the
wpi_rfkill_resume() function will take care of the lock.
PR: kern/14489
Approved by: re (kib)
Modified:
stable/8/sys/dev/wpi/if_wpi.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/wpi/if_wpi.c
==============================================================================
--- stable/8/sys/dev/wpi/if_wpi.c Mon Dec 20 23:41:31 2010
(r216607)
+++ stable/8/sys/dev/wpi/if_wpi.c Tue Dec 21 09:13:24 2010
(r216608)
@@ -3004,14 +3004,12 @@ wpi_rfkill_resume(struct wpi_softc *sc)
if (ntries == 1000) {
device_printf(sc->sc_dev,
"timeout waiting for thermal calibration\n");
- WPI_UNLOCK(sc);
return;
}
DPRINTFN(WPI_DEBUG_TEMP,("temperature %d\n", sc->temp));
if (wpi_config(sc) != 0) {
device_printf(sc->sc_dev, "device config failed\n");
- WPI_UNLOCK(sc);
return;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
