Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / net / ethernet / stmicro / stmmac / dwmac-loongson.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index 4c9a37d..ecf759e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -109,8 +109,10 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
                plat->bus_id = pci_dev_id(pdev);
 
        phy_mode = device_get_phy_mode(&pdev->dev);
-       if (phy_mode < 0)
+       if (phy_mode < 0) {
                dev_err(&pdev->dev, "phy_mode not found\n");
+               return phy_mode;
+       }
 
        plat->phy_interface = phy_mode;
        plat->interface = PHY_INTERFACE_MODE_GMII;