diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2010-09-14 04:02:44 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2010-09-14 04:02:44 +0000 |
| commit | f27778f03e1895835fb85a67ae60f1b4aff6f431 (patch) | |
| tree | 41f38891cb1d9f7016d0d495ce24f8ac6ebe678a | |
| parent | 2f2b3634d1b7246cbce0b03d4f593734e7828a62 (diff) | |
scsi_xsh_del the xs handler on DEACTIVATE.
same change as sd.c r1.212. matthew@ pointed out that cd(4) and
st(4) would need the same change.
| -rw-r--r-- | sys/scsi/cd.c | 3 | ||||
| -rw-r--r-- | sys/scsi/st.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 909335a4847..507091946bc 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.191 2010/09/12 01:54:48 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.192 2010/09/14 04:02:43 dlg Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -255,6 +255,7 @@ cdactivate(struct device *self, int act) case DVACT_DEACTIVATE: sc->sc_flags |= CDF_DYING; bufq_drain(&sc->sc_bufq); + scsi_xsh_del(&sc->sc_xsh); break; } return (rv); diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 44d268b06ec..3b5210a7c34 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.110 2010/09/14 01:43:38 krw Exp $ */ +/* $OpenBSD: st.c,v 1.111 2010/09/14 04:02:43 dlg Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -358,6 +358,7 @@ stactivate(struct device *self, int act) case DVACT_DEACTIVATE: st->flags |= ST_DYING; bufq_drain(&st->sc_bufq); + scsi_xsh_del(&st->sc_xsh); break; } |