projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc5306a
)
net: phy: micrel: Fix incorrect variable type in micrel
author
Wan Jiabing
<wanjiabing@vivo.com>
Mon, 9 May 2022 14:45:19 +0000
(22:45 +0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Tue, 10 May 2022 22:18:13 +0000
(15:18 -0700)
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")
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>
drivers/net/phy/micrel.c
patch
|
blob
|
history
diff --git
a/drivers/net/phy/micrel.c
b/drivers/net/phy/micrel.c
index
9d7dafe
..
cd9aa35
100644
(file)
--- a/
drivers/net/phy/micrel.c
+++ b/
drivers/net/phy/micrel.c
@@
-1743,7
+1743,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);
@@
-2444,8
+2444,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))