From d56c37fc044d81abc77e7aa9affeba5ce40218e3 Mon Sep 17 00:00:00 2001
From: Vitaliy Gusev <vgusev@openvz.org>
Date: Wed, 16 Sep 2009 00:00:21 -0700
Subject: [PATCH] --- yaml --- r: 162889 b: refs/heads/master c:
 634354d753898f9d9d146bd47628a1ef27f7dc98 h: refs/heads/master i:   162887:
 251e895435c731b0523c2b127db5198243d5235f v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/net/mlx4/catas.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 76055ab7124c..5c59ca1a3e5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 657e9649e745b06675aa5063c84430986cdc3afa
+refs/heads/master: 634354d753898f9d9d146bd47628a1ef27f7dc98
diff --git a/trunk/drivers/net/mlx4/catas.c b/trunk/drivers/net/mlx4/catas.c
index aa9674b7f19c..f599294fa8ab 100644
--- a/trunk/drivers/net/mlx4/catas.c
+++ b/trunk/drivers/net/mlx4/catas.c
@@ -96,12 +96,17 @@ static void catas_reset(struct work_struct *work)
 	spin_unlock_irq(&catas_lock);
 
 	list_for_each_entry_safe(priv, tmppriv, &tlist, catas_err.list) {
+		struct pci_dev *pdev = priv->dev.pdev;
+
 		ret = mlx4_restart_one(priv->dev.pdev);
-		dev = &priv->dev;
+		/* 'priv' now is not valid */
 		if (ret)
-			mlx4_err(dev, "Reset failed (%d)\n", ret);
-		else
+			printk(KERN_ERR "mlx4 %s: Reset failed (%d)\n",
+				pci_name(pdev), ret);
+		else {
+			dev  = pci_get_drvdata(pdev);
 			mlx4_dbg(dev, "Reset succeeded\n");
+		}
 	}
 }