diff options
| author | jkh <jkh@FreeBSD.org> | 1995-05-13 00:09:38 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-05-13 00:09:38 +0000 |
| commit | 5fe2640375173a3b39689905fe49b13fe867758a (patch) | |
| tree | 8e8c619c4d392c6211deba9ef5a868add0588e58 | |
| parent | 80e3b4e2e240fb9e5122342a331a95f9588832c7 (diff) | |
| download | FreeBSD-src-5fe2640375173a3b39689905fe49b13fe867758a.zip FreeBSD-src-5fe2640375173a3b39689905fe49b13fe867758a.tar.gz | |
"1 easy fix in 10 excrutiating steps"
A phone call from Manfred quickly pointed up the fact that I got the conflict
check backwards. NOW we implement the conflict checking correctly! Wheesh!
| -rw-r--r-- | sys/amd64/isa/isa.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/isa.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 152cae8..c4a2455 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.47 1995/05/11 02:15:52 jkh Exp $ + * $Id: isa.c,v 1.48 1995/05/11 05:20:43 jkh Exp $ */ /* @@ -174,7 +174,7 @@ haveseen(dvp, tmpdvp, checkbits) * Only check against devices that have already been found and are not * unilaterally allowed to conflict anyway. */ - if (tmpdvp->id_alive && !tmpdvp->id_conflicts) { + if (tmpdvp->id_alive && !dvp->id_conflicts) { char const *whatnot; whatnot = checkbits & CC_ATTACH ? "attach" : "prob"; diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 152cae8..c4a2455 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.47 1995/05/11 02:15:52 jkh Exp $ + * $Id: isa.c,v 1.48 1995/05/11 05:20:43 jkh Exp $ */ /* @@ -174,7 +174,7 @@ haveseen(dvp, tmpdvp, checkbits) * Only check against devices that have already been found and are not * unilaterally allowed to conflict anyway. */ - if (tmpdvp->id_alive && !tmpdvp->id_conflicts) { + if (tmpdvp->id_alive && !dvp->id_conflicts) { char const *whatnot; whatnot = checkbits & CC_ATTACH ? "attach" : "prob"; |
