diff mbox

amd-xgbe: unwind on error in xgbe_mdio_register()

Message ID 20140611065626.GC16443@mwanda
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Dan Carpenter June 11, 2014, 6:56 a.m. UTC 
There is a typo here so we return directly instead of unwinding.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Tom Lendacky June 11, 2014, 1:15 p.m. UTC | #1 
On 06/11/2014 01:56 AM, Dan Carpenter wrote:
> There is a typo here so we return directly instead of unwinding.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Tom Lendacky <thomas.lendacky@amd.com>

>
> diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
> index 52bbdbf..ea7a5d6 100644
> --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
> +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
> @@ -367,7 +367,7 @@ int xgbe_mdio_register(struct xgbe_prv_data *pdata)
>
>   	if (!phydev->drv || (phydev->drv->phy_id == 0)) {
>   		netdev_err(netdev, "phy_id not valid\n");
> -		return -ENODEV;
> +		ret = -ENODEV;
>   		goto err_phy_connect;
>   	}
>   	DBGPR("  phy_connect_direct succeeded for PHY %s, link=%d\n",
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller June 11, 2014, 10:40 p.m. UTC | #2 
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 11 Jun 2014 09:56:26 +0300

> There is a typo here so we return directly instead of unwinding.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
index 52bbdbf..ea7a5d6 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
@@ -367,7 +367,7 @@  int xgbe_mdio_register(struct xgbe_prv_data *pdata)
 
 	if (!phydev->drv || (phydev->drv->phy_id == 0)) {
 		netdev_err(netdev, "phy_id not valid\n");
-		return -ENODEV;
+		ret = -ENODEV;
 		goto err_phy_connect;
 	}
 	DBGPR("  phy_connect_direct succeeded for PHY %s, link=%d\n",