"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!
This commit is contained in:
Jordan K. Hubbard 1995-05-13 00:09:38 +00:00
parent e83d87f1fc
commit c25cfd0b0d
2 changed files with 4 additions and 4 deletions

View File

@ -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";

View File

@ -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";