diff options
Diffstat (limited to 'target/linux/mvebu/patches-4.14')
| -rw-r--r-- | target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch | 2 | ||||
| -rw-r--r-- | target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch b/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch index a0462e766e..b775116cda 100644 --- a/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch +++ b/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch @@ -14,7 +14,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1137,6 +1137,7 @@ static int sfp_remove(struct platform_de +@@ -1136,6 +1136,7 @@ static int sfp_remove(struct platform_de static const struct of_device_id sfp_of_match[] = { { .compatible = "sff,sfp", }, diff --git a/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch b/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch index a9a6634c23..e9a3d695da 100644 --- a/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch +++ b/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch @@ -22,20 +22,16 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> { struct phy_device *phy; int err; -@@ -497,12 +497,12 @@ static void sfp_sm_probe_phy(struct sfp - +@@ -498,11 +498,11 @@ static void sfp_sm_probe_phy(struct sfp phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR); + if (phy == ERR_PTR(-ENODEV)) { + dev_info(sfp->dev, "no PHY detected\n"); +- return; ++ return -EAGAIN; + } if (IS_ERR(phy)) { -+ if (PTR_ERR(phy) == -ENODEV) { -+ dev_dbg(sfp->dev, "no PHY detected\n"); -+ return -EAGAIN; -+ } dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy)); - return; -- } -- if (!phy) { -- dev_info(sfp->dev, "no PHY detected\n"); -- return; + return PTR_ERR(phy); } |