diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2010-04-28 18:49:45 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2010-04-28 18:49:45 +0000 |
| commit | aa1385cd7b366e2224febb0d3fce71f872ea8838 (patch) | |
| tree | eaa4cbe47dec08ec5180170a9bbcf66c51b04881 /sys/dev/ciss | |
| parent | b19b0de471acdb479b26017e573ce8babb43f7d0 (diff) | |
| download | src-aa1385cd7b366e2224febb0d3fce71f872ea8838.tar.gz src-aa1385cd7b366e2224febb0d3fce71f872ea8838.zip | |
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.
Notes
Notes:
svn path=/head/; revision=207335
Diffstat (limited to 'sys/dev/ciss')
| -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 7293bb1682df..2a4fb27ae552 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. |