diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:23:38 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:23:38 +0200 |
| commit | 4dd457f23089a7451c4b868f98dcd1af7c935a2f (patch) | |
| tree | 5ea6877c66742d239cb0d8d0a3bf16da29b8e5b6 /drivers/net/phy | |
| parent | 22ed338b405fef13bc4f85a89697908f687f92fc (diff) | |
| parent | d86dfc4d95cd218246b10ca7adf22c8626547599 (diff) | |
Merge tag 'v5.15.106' into 5.15-2.2.x-imx
This is the 5.15.106 stable release
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/dp83869.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c index 755220c6451f..cdf4e22fe85d 100644 --- a/drivers/net/phy/dp83869.c +++ b/drivers/net/phy/dp83869.c @@ -587,15 +587,13 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869_internal_delay[0], delay_size, true); if (dp83869->rx_int_delay < 0) - dp83869->rx_int_delay = - dp83869_internal_delay[DP83869_CLK_DELAY_DEF]; + dp83869->rx_int_delay = DP83869_CLK_DELAY_DEF; dp83869->tx_int_delay = phy_get_internal_delay(phydev, dev, &dp83869_internal_delay[0], delay_size, false); if (dp83869->tx_int_delay < 0) - dp83869->tx_int_delay = - dp83869_internal_delay[DP83869_CLK_DELAY_DEF]; + dp83869->tx_int_delay = DP83869_CLK_DELAY_DEF; return ret; } |