summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2020-07-20 16:09:49 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2020-07-20 16:09:49 +0000
commit2649308a1de4047f8bec02832abbca4e4ac28d51 (patch)
tree3249623d08d61408451d4c2f8a9a232d2c03bd6f /sys/dev/ic
parentc518aec027c1b6adad2ac59c5cc60c91a93da9f1 (diff)
Missed a chunk somewhere along the line. Use our_id vs our_id_b in
appropriate spots. Don't copy one empty/unused scsi_link (channel) to another empty/unused scsi_link (channel_b)
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/aic7xxx_openbsd.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c
index 56701c69fd0..e7fec789d82 100644
--- a/sys/dev/ic/aic7xxx_openbsd.c
+++ b/sys/dev/ic/aic7xxx_openbsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx_openbsd.c,v 1.67 2020/07/20 14:41:13 krw Exp $ */
+/* $OpenBSD: aic7xxx_openbsd.c,v 1.68 2020/07/20 16:09:48 krw Exp $ */
/* $NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $ */
/*
@@ -75,10 +75,6 @@ ahc_attach(struct ahc_softc *ahc)
s = splbio();
- if (ahc->features & AHC_TWIN) {
- ahc->sc_channel_b = ahc->sc_channel;
- }
-
#ifndef DEBUG
if (bootverbose) {
char ahc_info[256];
@@ -107,13 +103,13 @@ ahc_attach(struct ahc_softc *ahc)
ahc->sc_child = (struct scsibus_softc *)config_found(
(void *)&ahc->sc_dev, &saa, scsiprint);
if (ahc->features & AHC_TWIN) {
- saa.saa_adapter_target = ahc->our_id;
+ saa.saa_adapter_target = ahc->our_id_b;
ahc->sc_child_b = (struct scsibus_softc *)config_found(
(void *)&ahc->sc_dev, &saa, scsiprint);
}
} else {
if (ahc->features & AHC_TWIN) {
- saa.saa_adapter_target = ahc->our_id;
+ saa.saa_adapter_target = ahc->our_id_b;
ahc->sc_child = (struct scsibus_softc *)config_found(
(void *)&ahc->sc_dev, &saa, scsiprint);
}