d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize the callout structure earlier in attach before calling any

Browse Source 
routines that can fail since ciss_free() always tries to stop and drain
the callout.
This commit is contained in:
John Baldwin 2010-04-28 18:49:45 +00:00
parent b19b0de471
commit aa1385cd7b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/ciss/ciss.c
View File

@ -417,6 +417,7 @@ ciss_attach(device_t dev)
sc = device_get_softc(dev); sc = device_get_softc(dev);
sc->ciss_dev = dev; sc->ciss_dev = dev;
mtx_init(&sc->ciss_mtx, "cissmtx", NULL, MTX_DEF); mtx_init(&sc->ciss_mtx, "cissmtx", NULL, MTX_DEF);
callout_init_mtx(&sc->ciss_periodic, &sc->ciss_mtx, 0);
/* /*
* Do PCI-specific init. * Do PCI-specific init.
@ -429,7 +430,6 @@ ciss_attach(device_t dev)
*/ */
ciss_initq_free(sc); ciss_initq_free(sc);
ciss_initq_notify(sc); ciss_initq_notify(sc);
callout_init_mtx(&sc->ciss_periodic, &sc->ciss_mtx, 0);
/* /*
* Initalize device sysctls. * Initalize device sysctls.