---

yaml --- r: 299544 b: refs/heads/master c: 5b76d06 h: refs/heads/master v: v3
git-mirror · Apr 18, 2012 · be5f112 · be5f112
1 parent 8b9265c
commit be5f112
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;
 }