| Message ID | 20220510015521.2542096-1-wanjiabing@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 12a4d677b1c34717443470c1492fe520638ef39a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v3,net] net: phy: micrel: Fix incorrect variable type in micrel | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 10 May 2022 09:55:21 +0800 you wrote: > In lanphy_read_page_reg, calling __phy_read() might return a negative > error code. Use 'int' to check the error code. > > Fixes: 7c2dcfa295b1 ("net: phy: micrel: Add support for LAN8804 PHY") > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > Signed-off-by: Wan Jiabing <wanjiabing@vivo.com> > > [...] Here is the summary with links: - [v3,net] net: phy: micrel: Fix incorrect variable type in micrel https://git.kernel.org/netdev/net/c/12a4d677b1c3 You are awesome, thank you!
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index a06661c07ca8..c34a93403d1e 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -1959,7 +1959,7 @@ static int ksz886x_cable_test_get_status(struct phy_device *phydev, static int lanphy_read_page_reg(struct phy_device *phydev, int page, u32 addr) { - u32 data; + int data; phy_lock_mdio_bus(phydev); __phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL, page); @@ -2660,8 +2660,7 @@ static int lan8804_config_init(struct phy_device *phydev) static irqreturn_t lan8814_handle_interrupt(struct phy_device *phydev) { - u16 tsu_irq_status; - int irq_status; + int irq_status, tsu_irq_status; irq_status = phy_read(phydev, LAN8814_INTS); if (irq_status > 0 && (irq_status & LAN8814_INT_LINK))
In lanphy_read_page_reg, calling __phy_read() might return a negative error code. Use 'int' to check the error code. Fixes: 7c2dcfa295b1 ("net: phy: micrel: Add support for LAN8804 PHY") Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com> --- Changelog: v2: - Add a 'Fixes' tag. v3: - Fix a typo in subject line. --- drivers/net/phy/micrel.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)