diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-23 06:32:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-23 06:32:48 +0300 |
| commit | 218b6a5b23e939caf2064549b1cb61ba22b9d0a1 (patch) | |
| tree | bdabf5439fb58905268953165779614d2aadb677 /drivers/net/ethernet/atheros/atlx/atl2.c | |
| parent | 1db3a61017c627d590315347ccf302d9a6b97970 (diff) | |
| parent | fadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5 (diff) | |
| download | linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/atheros/atlx/atl2.c')
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index 63f2deec2a52..77a1c03255de 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c @@ -1353,6 +1353,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) && pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { printk(KERN_ERR "atl2: No usable DMA configuration, aborting\n"); + err = -EIO; goto err_dma; } @@ -1366,10 +1367,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) * pcibios_set_master to do the needed arch specific settings */ pci_set_master(pdev); - err = -ENOMEM; netdev = alloc_etherdev(sizeof(struct atl2_adapter)); - if (!netdev) + if (!netdev) { + err = -ENOMEM; goto err_alloc_etherdev; + } SET_NETDEV_DEV(netdev, &pdev->dev); @@ -1408,8 +1410,6 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (err) goto err_sw_init; - err = -EIO; - netdev->hw_features = NETIF_F_HW_VLAN_CTAG_RX; netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX); |