diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-09-23 10:06:08 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-09-23 10:06:08 -0400 |
commit | 69604fe76e58c9d195e48b41d019b07fc27ce9d7 (patch) | |
tree | c9d1e7cfe406a8f168c3aceaf989eea0275d3045 /drivers/net/phy/meson-gxl.c | |
parent | 50b2d49bafa16e6311ab2da82f5aafc5f9ada99b (diff) | |
parent | 189e7d876e48d7c791fe1c9c01516f70f5621a9f (diff) |
Merge tag 'kvm-s390-master-6.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
More pci fixes
Fix for a code analyser warning
Diffstat (limited to 'drivers/net/phy/meson-gxl.c')
-rw-r--r-- | drivers/net/phy/meson-gxl.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 73f7962a37d3..c49062ad72c6 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -243,13 +243,7 @@ static irqreturn_t meson_gxl_handle_interrupt(struct phy_device *phydev) irq_status == INTSRC_ENERGY_DETECT) return IRQ_HANDLED; - /* Give PHY some time before MAC starts sending data. This works - * around an issue where network doesn't come up properly. - */ - if (!(irq_status & INTSRC_LINK_DOWN)) - phy_queue_state_machine(phydev, msecs_to_jiffies(100)); - else - phy_trigger_machine(phydev); + phy_trigger_machine(phydev); return IRQ_HANDLED; } |