Skip to content

Commit

Permalink
qla3xxx: Return proper error codes when the 4022/4032 is being probed
Browse files Browse the repository at this point in the history
The return code was not properly set when when allocating memory or mapping
memory failed.  Depending on the stack, the return code would sometimes
return 0, which indicates everything was ok, when in fact there was an error.
  This would cause trouble when the module was removed.  Now, we will pass
back the proper return code when an error occurs during the PCI probe.

Signed-off-by: Benjamin Li <benjamin.li@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Benjamin Li authored and Jeff Garzik committed Feb 27, 2007
1 parent 908b637 commit 546faf0
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/net/qla3xxx.c
Expand Up @@ -3609,8 +3609,12 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
}

ndev = alloc_etherdev(sizeof(struct ql3_adapter));
if (!ndev)
if (!ndev) {
printk(KERN_ERR PFX "%s could not alloc etherdev\n",
pci_name(pdev));
err = -ENOMEM;
goto err_out_free_regions;
}

SET_MODULE_OWNER(ndev);
SET_NETDEV_DEV(ndev, &pdev->dev);
Expand Down Expand Up @@ -3639,6 +3643,7 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
if (!qdev->mem_map_registers) {
printk(KERN_ERR PFX "%s: cannot map device registers\n",
pci_name(pdev));
err = -EIO;
goto err_out_free_ndev;
}

Expand Down Expand Up @@ -3667,6 +3672,7 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
printk(KERN_ALERT PFX
"ql3xxx_probe: Adapter #%d, Invalid NVRAM parameters.\n",
qdev->index);
err = -EIO;
goto err_out_iounmap;
}

Expand Down

0 comments on commit 546faf0

Please sign in to comment.