---

yaml --- r: 64103 b: refs/heads/master c: 947b2a8 h: refs/heads/master i: 64101: 8cee32a 64099: d62d7e6 64095: 9c81983 v: v3
git-mirror · Aug 13, 2007 · 1dca425 · 1dca425
1 parent 6b4ae58
commit 1dca425
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6958e827f187c9c5cd39af075567f74f02bf3dd1
+refs/heads/master: 947b2a8083a03e6fff448ce8928956015614855e
diff --git a/trunk/drivers/net/mlx4/reset.c b/trunk/drivers/net/mlx4/reset.c
@@ -119,6 +119,9 @@ int mlx4_reset(struct mlx4_dev *dev)
 	writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);
 	iounmap(reset);
 
+	/* Docs say to wait one second before accessing device */
+	msleep(1000);
+
 	end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;
 	do {
 		if (!pci_read_config_word(dev->pdev, PCI_VENDOR_ID, &vendor) &&