From be5f112b955f4c9d4eafc221a55003c6b5c1373e Mon Sep 17 00:00:00 2001
From: Christian Riesch <christian.riesch@omicron.at>
Date: Mon, 16 Apr 2012 04:35:25 +0000
Subject: [PATCH] --- yaml --- r: 299544 b: refs/heads/master c:
 5b76d0600b2b08eef77f8e9226938b7b6bde3099 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/ethernet/ti/davinci_mdio.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9267eb811540..65f6f0074be8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cda31e10baf47a8a7d9360d9488fb76294be1ca3
+refs/heads/master: 5b76d0600b2b08eef77f8e9226938b7b6bde3099
diff --git a/trunk/drivers/net/ethernet/ti/davinci_mdio.c b/trunk/drivers/net/ethernet/ti/davinci_mdio.c
index 2757c7d6e633..e4e47088e26b 100644
--- a/trunk/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/trunk/drivers/net/ethernet/ti/davinci_mdio.c
@@ -181,6 +181,11 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data)
 		__davinci_mdio_reset(data);
 		return -EAGAIN;
 	}
+
+	reg = __raw_readl(&regs->user[0].access);
+	if ((reg & USERACCESS_GO) == 0)
+		return 0;
+
 	dev_err(data->dev, "timed out waiting for user access\n");
 	return -ETIMEDOUT;
 }