Merge branch 'mscc-fixes'
Gustavo A. R. Silva says: ==================== fix signedness bug and memory leak in mscc driver This patchset aims to fix a signedness bug in function vsc85xx_downshift_get() and a memory leak in function vsc8574_config_pre_init(). Changes in v3: - Add Quentin's Reviewed-by to commit log in patch 2/2. - Post the series to netdev. Changes in v2: - Add Quentin's Reviewed-by to commit log in patch 1/2. - Jump to out label so all functions in the driver exit with the PHY set to access the standard page. Thanks to Quentin Schulz for pointing this out. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Коммит
1010c17ec5
|
@ -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)
|
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,
|
reg_val = phy_read_paged(phydev, MSCC_PHY_PAGE_EXTENDED,
|
||||||
MSCC_PHY_ACTIPHY_CNTL);
|
MSCC_PHY_ACTIPHY_CNTL);
|
||||||
|
@ -1292,7 +1292,7 @@ static int vsc8574_config_pre_init(struct phy_device *phydev)
|
||||||
dev_err(dev,
|
dev_err(dev,
|
||||||
"%s: failed to assert reset of micro\n",
|
"%s: failed to assert reset of micro\n",
|
||||||
__func__);
|
__func__);
|
||||||
return ret;
|
goto out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче