diff --git a/[refs] b/[refs] index b9d08842e505..72424f2e7ffc 100644 --- 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 index ddc130b23378..253b3ac16046 100644 --- 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);