diff options
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 707b391afa02..894a7c84faef 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
| @@ -4119,7 +4119,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev, | |||
| 4119 | err = pcie_set_readrq(pdev, 4096); | 4119 | err = pcie_set_readrq(pdev, 4096); |
| 4120 | if (err) { | 4120 | if (err) { |
| 4121 | dev_err(&pdev->dev, "Set readrq failed.\n"); | 4121 | dev_err(&pdev->dev, "Set readrq failed.\n"); |
| 4122 | goto err_out; | 4122 | goto err_out1; |
| 4123 | } | 4123 | } |
| 4124 | 4124 | ||
| 4125 | err = pci_request_regions(pdev, DRV_NAME); | 4125 | err = pci_request_regions(pdev, DRV_NAME); |
| @@ -4140,7 +4140,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev, | |||
| 4140 | 4140 | ||
| 4141 | if (err) { | 4141 | if (err) { |
| 4142 | dev_err(&pdev->dev, "No usable DMA configuration.\n"); | 4142 | dev_err(&pdev->dev, "No usable DMA configuration.\n"); |
| 4143 | goto err_out; | 4143 | goto err_out2; |
| 4144 | } | 4144 | } |
| 4145 | 4145 | ||
| 4146 | /* Set PCIe reset type for EEH to fundamental. */ | 4146 | /* Set PCIe reset type for EEH to fundamental. */ |
| @@ -4152,7 +4152,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev, | |||
| 4152 | if (!qdev->reg_base) { | 4152 | if (!qdev->reg_base) { |
| 4153 | dev_err(&pdev->dev, "Register mapping failed.\n"); | 4153 | dev_err(&pdev->dev, "Register mapping failed.\n"); |
| 4154 | err = -ENOMEM; | 4154 | err = -ENOMEM; |
| 4155 | goto err_out; | 4155 | goto err_out2; |
| 4156 | } | 4156 | } |
| 4157 | 4157 | ||
| 4158 | qdev->doorbell_area_size = pci_resource_len(pdev, 3); | 4158 | qdev->doorbell_area_size = pci_resource_len(pdev, 3); |
| @@ -4162,14 +4162,14 @@ static int __devinit ql_init_device(struct pci_dev *pdev, | |||
| 4162 | if (!qdev->doorbell_area) { | 4162 | if (!qdev->doorbell_area) { |
| 4163 | dev_err(&pdev->dev, "Doorbell register mapping failed.\n"); | 4163 | dev_err(&pdev->dev, "Doorbell register mapping failed.\n"); |
| 4164 | err = -ENOMEM; | 4164 | err = -ENOMEM; |
| 4165 | goto err_out; | 4165 | goto err_out2; |
| 4166 | } | 4166 | } |
| 4167 | 4167 | ||
| 4168 | err = ql_get_board_info(qdev); | 4168 | err = ql_get_board_info(qdev); |
| 4169 | if (err) { | 4169 | if (err) { |
| 4170 | dev_err(&pdev->dev, "Register access failed.\n"); | 4170 | dev_err(&pdev->dev, "Register access failed.\n"); |
| 4171 | err = -EIO; | 4171 | err = -EIO; |
| 4172 | goto err_out; | 4172 | goto err_out2; |
| 4173 | } | 4173 | } |
| 4174 | qdev->msg_enable = netif_msg_init(debug, default_msg); | 4174 | qdev->msg_enable = netif_msg_init(debug, default_msg); |
| 4175 | spin_lock_init(&qdev->hw_lock); | 4175 | spin_lock_init(&qdev->hw_lock); |
| @@ -4179,7 +4179,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev, | |||
| 4179 | err = qdev->nic_ops->get_flash(qdev); | 4179 | err = qdev->nic_ops->get_flash(qdev); |
| 4180 | if (err) { | 4180 | if (err) { |
| 4181 | dev_err(&pdev->dev, "Invalid FLASH.\n"); | 4181 | dev_err(&pdev->dev, "Invalid FLASH.\n"); |
| 4182 | goto err_out; | 4182 | goto err_out2; |
| 4183 | } | 4183 | } |
| 4184 | 4184 | ||
| 4185 | memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len); | 4185 | memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len); |
| @@ -4212,8 +4212,9 @@ static int __devinit ql_init_device(struct pci_dev *pdev, | |||
| 4212 | DRV_NAME, DRV_VERSION); | 4212 | DRV_NAME, DRV_VERSION); |
| 4213 | } | 4213 | } |
| 4214 | return 0; | 4214 | return 0; |
| 4215 | err_out: | 4215 | err_out2: |
| 4216 | ql_release_all(pdev); | 4216 | ql_release_all(pdev); |
| 4217 | err_out1: | ||
| 4217 | pci_disable_device(pdev); | 4218 | pci_disable_device(pdev); |
| 4218 | return err; | 4219 | return err; |
| 4219 | } | 4220 | } |
