mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-28 11:57:28 +00:00
Code Issues Releases Activity

Fix panic by adding mtx_assert() to urtwn_init_locked() and

Browse Source 
urtwn_stop_locked().

Tested by:	Anthony Jenkins <scoobi_doo at yahoo dot com>
This commit is contained in:
Kevin Lo 2014-04-24 03:16:47 +00:00
parent 9acc9dc691
commit d0cc98c0b1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=264864
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/usb/wlan/if_urtwn.c
View File

@ -2054,6 +2054,7 @@ urtwn_load_firmware(struct urtwn_softc *sc)
uint32_t reg;
int mlen, ntries, page, error;
URTWN_UNLOCK(sc);
/* Read firmware image from the filesystem. */
if ((sc->chip & (URTWN_CHIP_UMC_A_CUT | URTWN_CHIP_92C)) ==
URTWN_CHIP_UMC_A_CUT)
@ -2062,6 +2063,7 @@ urtwn_load_firmware(struct urtwn_softc *sc)
imagename = "urtwn-rtl8192cfwT";
fw = firmware_get(imagename);
URTWN_LOCK(sc);
if (fw == NULL) {
device_printf(sc->sc_dev,
"failed loadfirmware of file %s\n", imagename);
@ -2816,6 +2818,8 @@ urtwn_init_locked(void *arg)
uint32_t reg;
int error;
URTWN_ASSERT_LOCKED(sc);
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
urtwn_stop_locked(ifp);
@ -2979,6 +2983,8 @@ urtwn_stop_locked(struct ifnet *ifp)
{
struct urtwn_softc *sc = ifp->if_softc;
URTWN_ASSERT_LOCKED(sc);
ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
callout_stop(&sc->sc_watchdog_ch);