summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2011-04-07 14:56:38 +0000
committermiod <miod@openbsd.org>2011-04-07 14:56:38 +0000
commitc3c6b8b438c381c54b05673bab3ef202449be5cf (patch)
treee19c80fc9af25d858e533414cfd8b8d4bbb72e92
parentSync apic code from hppa. (diff)
downloadwireguard-openbsd-c3c6b8b438c381c54b05673bab3ef202449be5cf.tar.xz
wireguard-openbsd-c3c6b8b438c381c54b05673bab3ef202449be5cf.zip
Avoid using an uninitialized variable when downgrading PIO mode too much on
ITExpress chipsets. (similar to 1.243, with a deja vu)
-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 df984f4b6df..b9c4572cd85 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.324 2011/04/03 15:36:03 jasper Exp $ */
+/* $OpenBSD: pciide.c,v 1.325 2011/04/07 14:56:38 miod Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -8450,6 +8450,7 @@ ite_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);