summaryrefslogtreecommitdiff
path: root/sys/dev/iir
diff options
context:
space:
mode:
authorScott Long <scottl@FreeBSD.org>2007-06-17 05:55:54 +0000
committerScott Long <scottl@FreeBSD.org>2007-06-17 05:55:54 +0000
commitb50569b71dfb110a58aa3e83f629115291802a74 (patch)
tree1f069a0af9a8c28e09089c8dc789bcd435a94cce /sys/dev/iir
parent6eb9bbf3299f31b6cbda15bb91fc20ed7c808e35 (diff)
Notes
Diffstat (limited to 'sys/dev/iir')
-rw-r--r--sys/dev/iir/iir.c2
-rw-r--r--sys/dev/iir/iir.h1
-rw-r--r--sys/dev/iir/iir_pci.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index b58306b73798..34a801c211c5 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -505,7 +505,7 @@ iir_attach(struct gdt_softc *gdt)
gdt, gdt->sc_hanum, &Giant,
/*untagged*/1,
/*tagged*/GDT_MAXCMDS, devq);
- if (xpt_bus_register(gdt->sims[i], i) != CAM_SUCCESS) {
+ if (xpt_bus_register(gdt->sims[i], gdt->sc_devnode, i) != CAM_SUCCESS) {
cam_sim_free(gdt->sims[i], /*free_devq*/i == 0);
break;
}
diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index 62f429abf117..dca493d6b844 100644
--- a/sys/dev/iir/iir.h
+++ b/sys/dev/iir/iir.h
@@ -590,6 +590,7 @@ struct gdt_intr_ctx {
/* softc structure */
struct gdt_softc {
+ device_t sc_devnode;
int sc_hanum;
int sc_class; /* Controller class */
#define GDT_MPR 0x05
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index dbeff0bedc62..528b7d71ef95 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -209,7 +209,7 @@ iir_pci_attach(device_t dev)
}
gdt = device_get_softc(dev);
- bzero(gdt, sizeof(struct gdt_softc));
+ gdt->sc_devnode = dev;
gdt->sc_init_level = 0;
gdt->sc_dpmemt = rman_get_bustag(io);
gdt->sc_dpmemh = rman_get_bushandle(io);