---

yaml --- r: 368811 b: refs/heads/master c: d8fe343 h: refs/heads/master i: 368809: b101893 368807: 58552da v: v3
git-mirror · Apr 2, 2013 · 185954a · 185954a
1 parent bf594d2
commit 185954a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8466563e16d5198b6efeb3b51791b95b6aaacb6b
+refs/heads/master: d8fe3436df256ce48d953dc342ac114e6e368476
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@ -560,6 +560,8 @@ void qlcnic_set_multi(struct net_device *netdev)
 			netdev_for_each_mc_addr(ha, netdev) {
 				cur = kzalloc(sizeof(struct qlcnic_mac_list_s),
 					      GFP_ATOMIC);
+				if (cur == NULL)
+					break;
 				memcpy(cur->mac_addr,
 				       ha->addr, ETH_ALEN);
 				list_add_tail(&cur->list, &adapter->vf_mc_list);