Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / drivers / net / phy / mscc.c

diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index bffe077..a2e59f4 100644 (file)
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -522,7 +522,7 @@ static int vsc85xx_mdix_set(struct phy_device *phydev, u8 mdix)
 
 static int vsc85xx_downshift_get(struct phy_device *phydev, u8 *count)
 {
-       u16 reg_val;
+       int reg_val;
 
        reg_val = phy_read_paged(phydev, MSCC_PHY_PAGE_EXTENDED,
                                 MSCC_PHY_ACTIPHY_CNTL);
@@ -1292,7 +1292,7 @@ static int vsc8574_config_pre_init(struct phy_device *phydev)
                                dev_err(dev,
                                        "%s: failed to assert reset of micro\n",
                                        __func__);
-                               return ret;
+                               goto out;
                        }
                }
        } else {