Author: bschmidt
Date: Sat Dec 18 15:25:21 2010
New Revision: 216521
URL: http://svn.freebsd.org/changeset/base/216521

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/144898
  MFC after:    3 days

Modified:
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c   Sat Dec 18 14:34:05 2010        (r216520)
+++ head/sys/dev/wpi/if_wpi.c   Sat Dec 18 15:25:21 2010        (r216521)
@@ -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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to