diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-11-25 22:28:55 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-11-25 22:28:55 +0000 |
| commit | dbb5f4cd4dea6d160a44e1f16c75bf47ec1625a5 (patch) | |
| tree | 608c729f190670e6c583bfbd5dffc58bcd26e81e /sys/scsi/scsi_base.c | |
| parent | 88b7bfd8f80bb0f30eeb353499f8caf283c0d92e (diff) | |
dont use the adapter_softc member of scsi_link as a softc anymore. the
"adapter_softc" is simply a way for the adapter to determine what scsibus
it is now dealing with, not a pointer back to the adapters device struct.
ok deraadt@ marco@
Diffstat (limited to 'sys/scsi/scsi_base.c')
| -rw-r--r-- | sys/scsi/scsi_base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index d4355114148..e95064c63d9 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_base.c,v 1.123 2007/09/16 01:30:24 krw Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.124 2007/11/25 22:28:53 dlg Exp $ */ /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */ /* @@ -1171,10 +1171,12 @@ scsi_interpret_sense(struct scsi_xfer *xs) void sc_print_addr(struct scsi_link *sc_link) { + struct device *adapter_device = sc_link->bus->sc_dev.dv_parent; + printf("%s(%s:%d:%d): ", sc_link->device_softc ? ((struct device *)sc_link->device_softc)->dv_xname : "probe", - ((struct device *)sc_link->adapter_softc)->dv_xname, + adapter_device->dv_xname, sc_link->target, sc_link->lun); } |