Skip to content

Commit 12a4d67

Browse files
Wan Jiabingkuba-moo
authored andcommitted
net: phy: micrel: Fix incorrect variable type in micrel
In lanphy_read_page_reg, calling __phy_read() might return a negative error code. Use 'int' to check the error code. Fixes: 7c2dcfa ("net: phy: micrel: Add support for LAN8804 PHY") Signed-off-by: Wan Jiabing <wanjiabing@vivo.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://lore.kernel.org/r/20220509144519.2343399-1-wanjiabing@vivo.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent dc5306a commit 12a4d67

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/net/phy/micrel.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,7 +1743,7 @@ static int ksz886x_cable_test_get_status(struct phy_device *phydev,
17431743

17441744
static int lanphy_read_page_reg(struct phy_device *phydev, int page, u32 addr)
17451745
{
1746-
u32 data;
1746+
int data;
17471747

17481748
phy_lock_mdio_bus(phydev);
17491749
__phy_write(phydev, LAN_EXT_PAGE_ACCESS_CONTROL, page);
@@ -2444,8 +2444,7 @@ static int lan8804_config_init(struct phy_device *phydev)
24442444

24452445
static irqreturn_t lan8814_handle_interrupt(struct phy_device *phydev)
24462446
{
2447-
u16 tsu_irq_status;
2448-
int irq_status;
2447+
int irq_status, tsu_irq_status;
24492448

24502449
irq_status = phy_read(phydev, LAN8814_INTS);
24512450
if (irq_status > 0 && (irq_status & LAN8814_INT_LINK))

0 commit comments

Comments
 (0)