From 8c6f80178c95526c714e781a3dc103fe5d85bbd8 Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Fri, 16 Sep 2011 15:06:48 +0000 Subject: [PATCH] --- yaml --- r: 265953 b: refs/heads/master c: b9fa1fbf98178c8bbda23ff1d3ed0731bb3c0bd1 h: refs/heads/master i: 265951: 7b8f9529d320fdb736d11438c81a7ad18e86bf7e v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/brocade/bna/bnad.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4eec4fa60d48..2c0728a9d580 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fb9852f98ffb4cdd3bad6eb50b1a6d58cee1298 +refs/heads/master: b9fa1fbf98178c8bbda23ff1d3ed0731bb3c0bd1 diff --git a/trunk/drivers/net/ethernet/brocade/bna/bnad.c b/trunk/drivers/net/ethernet/brocade/bna/bnad.c index 33ab1f81c1c2..abca1399fe51 100644 --- a/trunk/drivers/net/ethernet/brocade/bna/bnad.c +++ b/trunk/drivers/net/ethernet/brocade/bna/bnad.c @@ -1875,10 +1875,10 @@ bnad_cleanup_rx(struct bnad *bnad, u32 rx_id) spin_lock_irqsave(&bnad->bna_lock, flags); bna_rx_destroy(rx_info->rx); - spin_unlock_irqrestore(&bnad->bna_lock, flags); rx_info->rx = NULL; rx_info->rx_id = 0; + spin_unlock_irqrestore(&bnad->bna_lock, flags); bnad_rx_res_free(bnad, res_info); } @@ -1932,12 +1932,13 @@ bnad_setup_rx(struct bnad *bnad, u32 rx_id) spin_lock_irqsave(&bnad->bna_lock, flags); rx = bna_rx_create(&bnad->bna, bnad, rx_config, &rx_cbfn, res_info, rx_info); - spin_unlock_irqrestore(&bnad->bna_lock, flags); if (!rx) { err = -ENOMEM; + spin_unlock_irqrestore(&bnad->bna_lock, flags); goto err_return; } rx_info->rx = rx; + spin_unlock_irqrestore(&bnad->bna_lock, flags); /* * Init NAPI, so that state is set to NAPI_STATE_SCHED,