diff options
| author | Bernhard Schmidt <bschmidt@FreeBSD.org> | 2010-12-18 15:25:21 +0000 |
|---|---|---|
| committer | Bernhard Schmidt <bschmidt@FreeBSD.org> | 2010-12-18 15:25:21 +0000 |
| commit | 5f69ca6227f645953c01d8edc656771efee2d6e0 (patch) | |
| tree | 3ca102ee44c496825c6cda4061199743ef8d7d6e /sys/dev/wpi | |
| parent | 8e7c4a05220fe4ad352810647d1fb49237bce0e1 (diff) | |
| download | src-5f69ca6227f645953c01d8edc656771efee2d6e0.tar.gz src-5f69ca6227f645953c01d8edc656771efee2d6e0.zip | |
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
Notes
Notes:
svn path=/head/; revision=216521
Diffstat (limited to 'sys/dev/wpi')
| -rw-r--r-- | sys/dev/wpi/if_wpi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index 72d59109fec5..c5b171f8d2b2 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -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; } |