summaryrefslogtreecommitdiffstats
path: root/drivers/net/benet
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2011-06-29 23:33:37 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-30 22:32:50 -0700
commitb9ab82c774d8abcca8b6c1d5f30f5912a4448980 (patch)
tree6913c9ae6d847431557704d02322b5127e92d554 /drivers/net/benet
parent482c9e798738dea847a5e5e0d20692fe80d48a76 (diff)
downloadblackbird-op-linux-b9ab82c774d8abcca8b6c1d5f30f5912a4448980.tar.gz
blackbird-op-linux-b9ab82c774d8abcca8b6c1d5f30f5912a4448980.zip
be2net: clear intr bit in be_probe()
It may be set in the card while the driver is probed by kdump kernel after a crash. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
-rw-r--r--drivers/net/benet/be_main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 5b319d78f355..696f634b7e38 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -3417,6 +3417,12 @@ static int __devinit be_probe(struct pci_dev *pdev,
if (status)
goto stats_clean;
+ /* The INTR bit may be set in the card when probed by a kdump kernel
+ * after a crash.
+ */
+ if (!lancer_chip(adapter))
+ be_intr_set(adapter, false);
+
be_msix_enable(adapter);
INIT_DELAYED_WORK(&adapter->work, be_worker);
OpenPOWER on IntegriCloud