summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2006-06-26 22:14:59 +0000
committermiod <miod@openbsd.org>2006-06-26 22:14:59 +0000
commit8448e0bf3d6aec01a6ce55147ddb56897321c5b3 (patch)
treeb3235beb4b22234f4fb77ff395f7521cf9872d55
parentWhen attaching an USB keyboard, check the HID interface for its country code (diff)
downloadwireguard-openbsd-8448e0bf3d6aec01a6ce55147ddb56897321c5b3.tar.xz
wireguard-openbsd-8448e0bf3d6aec01a6ce55147ddb56897321c5b3.zip
Avoid using an uninitialized variable when downgrading PIO mode too much on
nForce chipsets.
-rw-r--r--sys/dev/pci/pciide.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 0c621ac86b5..44ab84074c4 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.242 2006/06/26 02:40:40 brad Exp $ */
+/* $OpenBSD: pciide.c,v 1.243 2006/06/26 22:14:59 miod Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -7881,6 +7881,7 @@ nforce_setup_channel(struct channel_softc *chp)
else
mode = drvp->DMA_mode + 2;
} else {
+ mode = drvp->PIO_mode;
goto pio;
}
idedma_ctl |= IDEDMA_CTL_DRV_DMA(drive);