AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

qlge: Fix error exit for probe call.

Browse Source 
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ron Mercer 2009-09-29 08:39:25 +00:00 committed by David S. Miller
parent f2c0d8df05
commit ebd6e7744f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/qlge/qlge_main.c
View File

@ -3832,11 +3832,14 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
return err; return err;
} }
qdev->ndev = ndev;
qdev->pdev = pdev;
pci_set_drvdata(pdev, ndev);
pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
if (pos <= 0) { if (pos <= 0) {
dev_err(&pdev->dev, PFX "Cannot find PCI Express capability, " dev_err(&pdev->dev, PFX "Cannot find PCI Express capability, "
"aborting.\n"); "aborting.\n");
goto err_out; return pos;
} else { } else {
pci_read_config_word(pdev, pos + PCI_EXP_DEVCTL, &val16); pci_read_config_word(pdev, pos + PCI_EXP_DEVCTL, &val16);
val16 &= ~PCI_EXP_DEVCTL_NOSNOOP_EN; val16 &= ~PCI_EXP_DEVCTL_NOSNOOP_EN;
@ -3849,7 +3852,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
err = pci_request_regions(pdev, DRV_NAME); err = pci_request_regions(pdev, DRV_NAME);
if (err) { if (err) {
dev_err(&pdev->dev, "PCI region request failed.\n"); dev_err(&pdev->dev, "PCI region request failed.\n");
goto err_out; return err;
} }
pci_set_master(pdev); pci_set_master(pdev);
@ -3867,7 +3870,6 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
goto err_out; goto err_out;
} }
pci_set_drvdata(pdev, ndev);
qdev->reg_base = qdev->reg_base =
ioremap_nocache(pci_resource_start(pdev, 1), ioremap_nocache(pci_resource_start(pdev, 1),
pci_resource_len(pdev, 1)); pci_resource_len(pdev, 1));
@ -3887,8 +3889,6 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
goto err_out; goto err_out;
} }
qdev->ndev = ndev;
qdev->pdev = pdev;
err = ql_get_board_info(qdev); err = ql_get_board_info(qdev);
if (err) { if (err) {
dev_err(&pdev->dev, "Register access failed.\n"); dev_err(&pdev->dev, "Register access failed.\n");