summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2006-05-22 05:21:57 +0000
committermiod <miod@openbsd.org>2006-05-22 05:21:57 +0000
commit4d5509bf3e01916868b980497bb38f3b8e6df0a7 (patch)
treef4c54cc067e709998cd8c8133549dfd7ecff6c6a
parentAdd mail box to mfi_mgmt to handle sub commands more gracefully. (diff)
downloadwireguard-openbsd-4d5509bf3e01916868b980497bb38f3b8e6df0a7.tar.xz
wireguard-openbsd-4d5509bf3e01916868b980497bb38f3b8e6df0a7.zip
In wdcprobe(), directly invoke wdc_do_reset() instead of using the reset
reset function pointer, as this can cause a NULL pointer dereference on some systems.
-rw-r--r--sys/dev/ic/wdc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 81424599dc3..ec66ab173c1 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc.c,v 1.92 2006/05/08 00:18:40 jsg Exp $ */
+/* $OpenBSD: wdc.c,v 1.93 2006/05/22 05:21:57 miod Exp $ */
/* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
@@ -683,7 +683,7 @@ wdcprobe(chp)
}
/* reset the channel */
- chp->wdc->reset(chp);
+ wdc_do_reset(chp);
ret_value = __wdcwait_reset(chp, ret_value);
WDCDEBUG_PRINT(("%s:%d: after reset, ret_value=0x%d\n",