diff options
| author | jhb <jhb@FreeBSD.org> | 2010-04-28 18:49:45 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2010-04-28 18:49:45 +0000 |
| commit | 5b51584fbcf94586ba465306cb52b8b8b48a6b43 (patch) | |
| tree | eaa4cbe47dec08ec5180170a9bbcf66c51b04881 /sys/dev/ciss/ciss.c | |
| parent | c08f91598386a9a8c862c74f597cb9741b3dd67c (diff) | |
| download | FreeBSD-src-5b51584fbcf94586ba465306cb52b8b8b48a6b43.zip FreeBSD-src-5b51584fbcf94586ba465306cb52b8b8b48a6b43.tar.gz | |
Initialize the callout structure earlier in attach before calling any
routines that can fail since ciss_free() always tries to stop and drain
the callout.
Diffstat (limited to 'sys/dev/ciss/ciss.c')
| -rw-r--r-- | sys/dev/ciss/ciss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 7293bb1..2a4fb27 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -417,6 +417,7 @@ ciss_attach(device_t dev) sc = device_get_softc(dev); sc->ciss_dev = dev; mtx_init(&sc->ciss_mtx, "cissmtx", NULL, MTX_DEF); + callout_init_mtx(&sc->ciss_periodic, &sc->ciss_mtx, 0); /* * Do PCI-specific init. @@ -429,7 +430,6 @@ ciss_attach(device_t dev) */ ciss_initq_free(sc); ciss_initq_notify(sc); - callout_init_mtx(&sc->ciss_periodic, &sc->ciss_mtx, 0); /* * Initalize device sysctls. |
