Don't check for IRQ conflicts before probing the device, so that

drivers have a chance to change their IRQ before it is checked.
This was implemented in revision 1.21 and broken in revision 1.26.
Drivers that can change their IRQ should probably be configured
with "irq ?".
This commit is contained in:
bde 1994-10-19 21:57:51 +00:00
parent b0fbd5a81d
commit 942fc20db7
2 changed files with 2 additions and 8 deletions

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.28 1994/10/17 21:16:38 phk Exp $
* $Id: isa.c,v 1.30 1994/10/19 01:59:06 wollman Exp $
*/
/*
@ -382,9 +382,6 @@ config_isadev_c(isdp, mp, reconfig)
struct isa_driver *dp = isdp->id_driver;
checkbits = 0;
#ifndef ALLOW_CONFLICT_IRQ
checkbits |= CC_IRQ;
#endif
#ifndef ALLOW_CONFLICT_DRQ
checkbits |= CC_DRQ;
#endif

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: isa.c,v 1.28 1994/10/17 21:16:38 phk Exp $
* $Id: isa.c,v 1.30 1994/10/19 01:59:06 wollman Exp $
*/
/*
@ -382,9 +382,6 @@ config_isadev_c(isdp, mp, reconfig)
struct isa_driver *dp = isdp->id_driver;
checkbits = 0;
#ifndef ALLOW_CONFLICT_IRQ
checkbits |= CC_IRQ;
#endif
#ifndef ALLOW_CONFLICT_DRQ
checkbits |= CC_DRQ;
#endif