svn commit: r208308 - stable/8/sys/dev/ciss

[John Baldwin]

Author: jhb
Date: Wed May 19 19:43:49 2010
New Revision: 208308
URL: http://svn.freebsd.org/changeset/base/208308

Log:
  MFC 207335:
  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.

Modified:
  stable/8/sys/dev/ciss/ciss.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/ciss/ciss.c
==============================================================================
--- stable/8/sys/dev/ciss/ciss.c	Wed May 19 19:03:19 2010	(r208307)
+++ stable/8/sys/dev/ciss/ciss.c	Wed May 19 19:43:49 2010	(r208308)
@@ -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.