From 84e2837aa6fbd5bac8f384acfdf3d4752a861a19 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Fri, 1 Feb 2013 12:09:19 +0000 Subject: [PATCH] --- yaml --- r: 352048 b: refs/heads/master c: 4f463855c7d5a0ed0faa62497f3006336e74ee16 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 282d0142910d..23199862a6eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33397a71217dda91b436726f046d78525fd08b22 +refs/heads/master: 4f463855c7d5a0ed0faa62497f3006336e74ee16 diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 064eaac9616f..19b3a2567a46 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -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;