From e4adf75e028ef3033c1c9fa6c99f62576990ee19 Mon Sep 17 00:00:00 2001 From: Sreenivasa Honnur Date: Wed, 1 Jul 2009 21:14:03 +0000 Subject: [PATCH] --- yaml --- r: 158745 b: refs/heads/master c: bd9ee6808b6c9106fd8046693c544d081746184b h: refs/heads/master i: 158743: d7f475142e5e7b674d791c21369e913d0b2fa2ca v: v3 --- [refs] | 2 +- trunk/drivers/net/vxge/vxge-main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index eeb944a6840c..df450eef836d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 914d0d714fa472d7f99ef899a8180628ecdcd23c +refs/heads/master: bd9ee6808b6c9106fd8046693c544d081746184b diff --git a/trunk/drivers/net/vxge/vxge-main.c b/trunk/drivers/net/vxge/vxge-main.c index fa4dbc89e270..dd2add1d7566 100644 --- a/trunk/drivers/net/vxge/vxge-main.c +++ b/trunk/drivers/net/vxge/vxge-main.c @@ -2890,6 +2890,9 @@ int do_vxge_close(struct net_device *dev, int do_io) vdev = (struct vxgedev *)netdev_priv(dev); hldev = (struct __vxge_hw_device *) pci_get_drvdata(vdev->pdev); + if (unlikely(!is_vxge_card_up(vdev))) + return 0; + /* If vxge_handle_crit_err task is executing, * wait till it completes. */ while (test_and_set_bit(__VXGE_STATE_RESET_CARD, &vdev->state))