From 2c9b32fe0c9fdc305376dfdb43155057cbf7007b Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 16 Dec 2005 11:09:01 -0800
Subject: [PATCH] --- yaml --- r: 15199 b: refs/heads/master c:
 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 h: refs/heads/master i:   15197:
 ed6e5c98e2f69884bb59218cb34ecb74a4045ba6   15195:
 00ae55e2c37344fa02ca73c08eff7b3bcd91c5ee   15191:
 93c8992c1ac4425346bf2de0f395f94b20327dfe   15183:
 25c3bda883decafb8d8f360872934c968668cc44   15167:
 f30b07bda28fe73e8aa62fc75357a03a4f53a2d9 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/uhci-hcd.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 778a60a3278b..4eb82476fbcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42f3ab42875a52af7e711803bfb8d8d7cca84c1c
+refs/heads/master: 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3
diff --git a/trunk/drivers/usb/host/uhci-hcd.c b/trunk/drivers/usb/host/uhci-hcd.c
index ed550132db0b..79efaf7d86a3 100644
--- a/trunk/drivers/usb/host/uhci-hcd.c
+++ b/trunk/drivers/usb/host/uhci-hcd.c
@@ -717,6 +717,7 @@ static int uhci_suspend(struct usb_hcd *hcd, pm_message_t message)
 	 * at the source, so we must turn off PIRQ.
 	 */
 	pci_write_config_word(to_pci_dev(uhci_dev(uhci)), USBLEGSUP, 0);
+	mb();
 	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
 	uhci->hc_inaccessible = 1;
 	hcd->poll_rh = 0;
@@ -738,6 +739,7 @@ static int uhci_resume(struct usb_hcd *hcd)
 	 * really don't want to keep a stale HCD_FLAG_HW_ACCESSIBLE=0
 	 */
 	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+	mb();
 
 	if (uhci->rh_state == UHCI_RH_RESET)	/* Dead */
 		return 0;