summaryrefslogtreecommitdiff
path: root/drivers/net/phy/phy_device.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-03-12 06:37:53 +0300
committerJakub Kicinski <kuba@kernel.org>2024-03-12 06:38:36 +0300
commited1f164038b50c5864aa85389f3ffd456f050cca (patch)
treef0f9d0fd52a798fbe3450d3d85795346411003a6 /drivers/net/phy/phy_device.c
parenta318d3d54c44f9916cd77ad272083d4a4d68899b (diff)
parent84e95149bd341705f0eca6a7fcb955c548805002 (diff)
downloadlinux-ed1f164038b50c5864aa85389f3ffd456f050cca.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.9 net-next PR. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
-rw-r--r--drivers/net/phy/phy_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 72452e6a478c..8297ef681bf5 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -3128,7 +3128,7 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev,
if (delay < 0)
return delay;
- if (delay && size == 0)
+ if (size == 0)
return delay;
if (delay < delay_values[0] || delay > delay_values[size - 1]) {