From a2cd97551f5c4342b01f978608bdd9807be4a123 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Tue, 21 Jun 2011 15:24:26 +0200
Subject: [PATCH] --- yaml --- r: 256634 b: refs/heads/master c:
 b14c369d87d7fbf120ad21919d34a8f1290290f1 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/firewire/ohci.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e07d5cf58664..d1cfe8eafcbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ef28ccd59a23d219c4660f55a11ac06ca91f632
+refs/heads/master: b14c369d87d7fbf120ad21919d34a8f1290290f1
diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c
index 3b6f3429fb4a..a818dc834690 100644
--- a/trunk/drivers/firewire/ohci.c
+++ b/trunk/drivers/firewire/ohci.c
@@ -513,6 +513,12 @@ static inline void flush_writes(const struct fw_ohci *ohci)
 	reg_read(ohci, OHCI1394_Version);
 }
 
+/*
+ * Beware!  read_phy_reg(), write_phy_reg(), update_phy_reg(), and
+ * read_paged_phy_reg() require the caller to hold ohci->phy_reg_mutex.
+ * In other words, only use ohci_read_phy_reg() and ohci_update_phy_reg()
+ * directly.  Exceptions are intrinsically serialized contexts like pci_probe.
+ */
 static int read_phy_reg(struct fw_ohci *ohci, int addr)
 {
 	u32 val;