summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2005-01-12 00:50:18 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2005-01-12 00:50:18 +0000
commit9e0dbf6a36ad465cf1f1d2aaf394ff124f14a36a (patch)
tree7a935e6bcf3640f8c69dc64b89104dec12aaf2db /sys
parenta31aebc4655d359f52bdd0cf5325ac0e1f1edaa6 (diff)
Don't call ahc_setup_data() after calling ahc_execute_scb() since the
scb may have been freed or made active. Only affects XS_RESET case. More correctly mirrors FreeBSD code. Already done to aic79xx_openbsd.c in r1.16.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/aic7xxx_openbsd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c
index ff5c3c7560e..3a9c0089b0a 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.27 2005/01/08 03:44:36 kevlo Exp $ */
+/* $OpenBSD: aic7xxx_openbsd.c,v 1.28 2005/01/12 00:50:17 krw Exp $ */
/* $NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $ */
/*
@@ -379,10 +379,10 @@ ahc_action(struct scsi_xfer *xs)
hscb->cdb_len = 0;
scb->flags |= SCB_DEVICE_RESET;
hscb->control |= MK_MESSAGE;
- ahc_execute_scb(scb, NULL, 0);
+ return (ahc_execute_scb(scb, NULL, 0));
}
- return ahc_setup_data(ahc, xs, scb);
+ return (ahc_setup_data(ahc, xs, scb));
}
int