diff options
| author | Scott Long <scottl@FreeBSD.org> | 2007-04-16 19:42:23 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2007-04-16 19:42:23 +0000 |
| commit | f35487464c7080ed1dc0e8dfdba0ea4abf24e048 (patch) | |
| tree | 41dea5683155fb4f2c32592d2e847279ba8ec4d8 /sys/cam | |
| parent | cd5c9285cdff52341bc7ef84f1f59e6253c05b4c (diff) | |
Notes
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/cam_periph.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index c0feec6332d1..e2e53035b4ee 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -501,7 +501,6 @@ cam_periph_invalidate(struct cam_periph *periph) static void camperiphfree(struct cam_periph *periph) { - int s; struct periph_driver **p_drv; for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { @@ -512,15 +511,13 @@ camperiphfree(struct cam_periph *periph) printf("camperiphfree: attempt to free non-existant periph\n"); return; } - - if (periph->periph_dtor != NULL) - periph->periph_dtor(periph); - - s = splsoftcam(); + TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links); (*p_drv)->generation++; - splx(s); + xpt_unlock_buses(); + if (periph->periph_dtor != NULL) + periph->periph_dtor(periph); xpt_remove_periph(periph); if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) { @@ -549,6 +546,7 @@ camperiphfree(struct cam_periph *periph) } xpt_free_path(periph->path); free(periph, M_CAMPERIPH); + xpt_lock_buses(); } /* |