From 1aae709cd3b2ab7cca89f9e8e70673f27c7aa8a0 Mon Sep 17 00:00:00 2001 From: Bhanu Prakash Gollapudi Date: Mon, 23 Jan 2012 18:00:46 -0800 Subject: [PATCH] --- yaml --- r: 292907 b: refs/heads/master c: 2a7b29c5f267c143e280c1a5174a0d930bd6c1e3 h: refs/heads/master i: 292905: 4dfca6bf868f136bb612949cdd75b59ce7d1c0ff 292903: ee87ac8936cacb5ce2b514c671a8d1f50ac64721 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b1f90085388a..6c9ad410c462 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f71af2febd53620a379d71527f98bbc2ba67e61 +refs/heads/master: 2a7b29c5f267c143e280c1a5174a0d930bd6c1e3 diff --git a/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 8c6156a10d90..10cf5d96ce29 100644 --- a/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -1537,6 +1537,7 @@ static void __bnx2fc_destroy(struct bnx2fc_interface *interface) static int bnx2fc_destroy(struct net_device *netdev) { struct bnx2fc_interface *interface = NULL; + struct workqueue_struct *timer_work_queue; int rc = 0; rtnl_lock(); @@ -1549,9 +1550,9 @@ static int bnx2fc_destroy(struct net_device *netdev) goto netdev_err; } - - destroy_workqueue(interface->timer_work_queue); + timer_work_queue = interface->timer_work_queue; __bnx2fc_destroy(interface); + destroy_workqueue(timer_work_queue); netdev_err: mutex_unlock(&bnx2fc_dev_lock);