From ebe9441c5f9677208cd2a130826bcb650ba53dac Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sat, 4 Sep 2010 02:08:41 +0000 Subject: [PATCH] --- yaml --- r: 214325 b: refs/heads/master c: ca1cef3a3a8af961f504abfcf9e13dac088e1ad1 h: refs/heads/master i: 214323: d3d403b15c84f6afee2a0e6d7d96866ca86f34d7 v: v3 --- [refs] | 2 +- trunk/drivers/net/bna/bnad.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 612539628871..a30489ab6138 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8f7f43a4ad451ecfb2689985f99a9e276a08bba +refs/heads/master: ca1cef3a3a8af961f504abfcf9e13dac088e1ad1 diff --git a/trunk/drivers/net/bna/bnad.c b/trunk/drivers/net/bna/bnad.c index 44adc7aefddc..8158fb93cb4c 100644 --- a/trunk/drivers/net/bna/bnad.c +++ b/trunk/drivers/net/bna/bnad.c @@ -2702,7 +2702,7 @@ bnad_set_rx_mode(struct net_device *netdev) kzalloc((mc_count + 1) * ETH_ALEN, GFP_ATOMIC); if (!mcaddr_list) - return; + goto unlock; memcpy(&mcaddr_list[0], &bnad_bcast_addr[0], ETH_ALEN); @@ -2715,6 +2715,7 @@ bnad_set_rx_mode(struct net_device *netdev) /* Should we enable BNAD_CF_ALLMULTI for err != 0 ? */ kfree(mcaddr_list); } +unlock: spin_unlock_irqrestore(&bnad->bna_lock, flags); }