---

yaml --- r: 214325 b: refs/heads/master c: ca1cef3 h: refs/heads/master i: 214323: d3d403b v: v3
git-mirror · Sep 7, 2010 · ebe9441 · ebe9441
1 parent 9abf8e1
commit ebe9441
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 }