summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
authorConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>2000-07-20 19:15:24 +0000
committerConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>2000-07-20 19:15:24 +0000
commitb4418bed77badfdb892e0982dabf2d40df3d6d73 (patch)
tree6069a881d36c15b5ca6f0ccdbafa4d07cca70c0f /sys/dev/isa
parent3119035ada5d482229e31efed27f732f469dcc7f (diff)
chp->wdc can be NULL on probe.
Propagate verbose flag from cf_data to channel
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/wdc_isa.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c
index e5b1d7ac83d..79937afcedd 100644
--- a/sys/dev/isa/wdc_isa.c
+++ b/sys/dev/isa/wdc_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_isa.c,v 1.4 1999/10/09 03:42:04 csapuntz Exp $ */
+/* $OpenBSD: wdc_isa.c,v 1.5 2000/07/20 19:15:22 csapuntz Exp $ */
/* $NetBSD: wdc_isa.c,v 1.15 1999/05/19 14:41:25 bouyer Exp $ */
/*-
@@ -107,6 +107,7 @@ wdc_isa_probe(parent, match, aux)
{
struct channel_softc ch;
struct isa_attach_args *ia = aux;
+ struct cfdata *cf = match;
int result = 0;
bzero(&ch, sizeof ch);
@@ -120,6 +121,9 @@ wdc_isa_probe(parent, match, aux)
WDC_ISA_AUXREG_NPORTS, 0, &ch.ctl_ioh))
goto outunmap;
+ if (cf->cf_flags & WDC_OPTION_PROBE_VERBOSE)
+ ch.ch_flags |= WDCF_VERBOSE_PROBE;
+
result = wdcprobe(&ch);
if (result) {
ia->ia_iosize = WDC_ISA_REG_NPORTS;