OSDN Git Service

i40e: fix error return code in i40e_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 24 Sep 2013 05:17:25 +0000 (05:17 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 29 Oct 2013 11:29:25 +0000 (04:29 -0700)
Fix to return -ENOMEM in the memory alloc error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 41a79df..be15938 100644 (file)
@@ -7204,8 +7204,10 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         */
        len = sizeof(struct i40e_vsi *) * pf->hw.func_caps.num_vsis;
        pf->vsi = kzalloc(len, GFP_KERNEL);
-       if (!pf->vsi)
+       if (!pf->vsi) {
+               err = -ENOMEM;
                goto err_switch_setup;
+       }
 
        err = i40e_setup_pf_switch(pf);
        if (err) {