diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:06:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:06:59 -0400 |
| commit | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (patch) | |
| tree | 6dc2a4c356b4f454fc85d0c7cb019986f6f4993b /drivers/net/mlx4/catas.c | |
| parent | 8ff0e082f0833d32c7523a6cd72b6cf6a2142ce8 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/net/mlx4/catas.c')
| -rw-r--r-- | drivers/net/mlx4/catas.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/mlx4/catas.c b/drivers/net/mlx4/catas.c index aa9674b7f19c..f599294fa8ab 100644 --- a/drivers/net/mlx4/catas.c +++ b/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"); + } } } |