From: Lendacky, Thomas Date: Fri, 16 Jan 2015 18:46:34 +0000 (-0600) Subject: amd-xgbe: Add check to be sure amd-xgbe-phy driver is used X-Git-Tag: v4.0-rc1~133^2~194^2~9 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94c043e53324478ed8ba33757dd7bc03298c83c7;p=karo-tx-linux.git amd-xgbe: Add check to be sure amd-xgbe-phy driver is used The amd-xgbe driver relies on the amd-xgbe-phy phylib driver. Add a check to be sure that if any errors occur during probing of the amd-xgbe-phy driver then the amd-xgbe driver returns an error. Signed-off-by: Tom Lendacky Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c index 7eeb03d271e2..41e29e2a65b0 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c @@ -260,10 +260,14 @@ int xgbe_mdio_register(struct xgbe_prv_data *pdata) of_node_put(phy_node); goto err_phy_device; } + if (!phydev->dev.driver) { + dev_err(pdata->dev, "phy driver probe failed\n"); + ret = -EIO; + goto err_phy_device; + } /* Add a reference to the PHY driver so it can't be unloaded */ - pdata->phy_module = phydev->dev.driver ? - phydev->dev.driver->owner : NULL; + pdata->phy_module = phydev->dev.driver->owner; if (!try_module_get(pdata->phy_module)) { dev_err(pdata->dev, "try_module_get failed\n"); ret = -EIO;