Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / stmicro / stmmac / stmmac_pci.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 064eaac9616f59a03e178a259371d1a10c14b7ca..023b7c29cb2fc3408ff3e3a00c03b9656ddd2ab4 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -88,7 +88,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
                        continue;
                addr = pci_iomap(pdev, i, 0);
                if (addr == NULL) {
-                       pr_err("%s: ERROR: cannot map register memory, aborting",
+                       pr_err("%s: ERROR: cannot map register memory aborting",
                               __func__);
                        ret = -EIO;
                        goto err_out_map_failed;
@@ -102,6 +102,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
        priv = stmmac_dvr_probe(&(pdev->dev), &plat_dat, addr);
        if (!priv) {
                pr_err("%s: main driver probe failed", __func__);
+               ret = -ENODEV;
                goto err_out;
        }
        priv->dev->irq = pdev->irq;