summaryrefslogtreecommitdiffstats
path: root/sys/dev/iir/iir.c
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2013-09-25 17:16:21 +0000
committerscottl <scottl@FreeBSD.org>2013-09-25 17:16:21 +0000
commite9cc92746f45b2e0ad6e2997f3128b950e702770 (patch)
treeebaa28f9cc2c11e9c0022f0db7fff2cc3e92b88c /sys/dev/iir/iir.c
parente2e8dc4dbba38724bc3ce5c338d23ab3c6bfada4 (diff)
downloadFreeBSD-src-e9cc92746f45b2e0ad6e2997f3128b950e702770.zip
FreeBSD-src-e9cc92746f45b2e0ad6e2997f3128b950e702770.tar.gz
Re-do r255853. Along with adding back the API/ABI changes from the
original, this hides the contents of cam_compat.h from ktrace/kdump/truss, avoiding problems there. There are no user-servicable parts in there, so no need for those tools to be groping around in there. Approved by: re
Diffstat (limited to 'sys/dev/iir/iir.c')
-rw-r--r--sys/dev/iir/iir.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index 684fce3..1090042 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -270,6 +270,7 @@ iir_init(struct gdt_softc *gdt)
gccb->gc_map_flag = TRUE;
gccb->gc_scratch = &gdt->sc_gcscratch[GDT_SCRATCH_SZ * i];
gccb->gc_scratch_busbase = gdt->sc_gcscratch_busbase + GDT_SCRATCH_SZ * i;
+ callout_handle_init(&gccb->gc_timeout_ch);
SLIST_INSERT_HEAD(&gdt->sc_free_gccb, gccb, sle);
}
gdt->sc_init_level++;
@@ -1239,7 +1240,7 @@ gdtexecuteccb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
ccb->ccb_h.status |= CAM_SIM_QUEUED;
/* timeout handling */
- ccb->ccb_h.timeout_ch =
+ gccb->gc_timeout_ch =
timeout(iir_timeout, (caddr_t)gccb,
(ccb->ccb_h.timeout * hz) / 1000);
@@ -1747,7 +1748,7 @@ gdt_sync_event(struct gdt_softc *gdt, int service,
printf("\n");
return (0);
} else {
- untimeout(iir_timeout, gccb, ccb->ccb_h.timeout_ch);
+ untimeout(iir_timeout, gccb, gccb->gc_timeout_ch);
if (gdt->sc_status == GDT_S_BSY) {
GDT_DPRINTF(GDT_D_DEBUG, ("gdt_sync_event(%p) gccb %p busy\n",
gdt, gccb));
OpenPOWER on IntegriCloud