From: Joshua Wise <joshua@escape.wv.cc.cmu.edu>
Date: Sat, 10 Oct 2009 23:04:43 +0000 (-0400)
Subject: Slightly permute the USB_LEGKEY stuff.
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/a807be6ab277fe4bde9285b55c2ac637160132cb?ds=inline

Slightly permute the USB_LEGKEY stuff.
---

diff --git a/hardware/ich2/smi.c b/hardware/ich2/smi.c
index 0e43185..b3df153 100644
--- a/hardware/ich2/smi.c
+++ b/hardware/ich2/smi.c
@@ -35,12 +35,10 @@ void smi_disable()
 	outl(smi_en, inl(smi_en) & ~ICH2_SMI_EN_GBL_SMI_EN);
 	
 	/* Try really hard to shut up USB_LEGKEY. */
-	pci_write16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY, 0x0);
 	pci_write16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY,
-		pci_read16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY));
-	pci_write16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY, 0x0);
+		pci_read16(ICH2_USB0_BUS, ICH2_USB0_DEV, ICH2_USB0_FN, ICH2_USB_LEGKEY) & ~0x8000);
 	pci_write16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY,
-		pci_read16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY));
+		pci_read16(ICH2_USB1_BUS, ICH2_USB1_DEV, ICH2_USB1_FN, ICH2_USB_LEGKEY) & ~0x8000);
 	
 }