diff options
| author |   krw <krw@openbsd.org> | 2005-01-12 00:50:17 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2005-01-12 00:50:17 +0000 |
| commit | e4a1433fd4249e16c238ba66b9db6c99cd23411a (patch) | |
| tree | 858d3655687f22f0d00b7c5acd19a82ba798aa66 | |
| parent | Fix an off by one in the critical section clearing code. The code was (diff) | |
| download | wireguard-openbsd-e4a1433fd4249e16c238ba66b9db6c99cd23411a.tar.xz wireguard-openbsd-e4a1433fd4249e16c238ba66b9db6c99cd23411a.zip | |
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.
| -rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.c | 6 |
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 |