diff options
| author | John Crispin <john@phrozen.org> | 2020-07-14 09:50:31 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2020-07-14 18:31:12 +0200 |
| commit | 2557d2eb4c41fd3fba080ee324e12091f8f53e97 (patch) | |
| tree | 0c49b411607f4a42f39c097ce38f145d0e3cd1ef /target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch | |
| parent | 3635f7efc1deef2a17b69000dcd20ad044e73706 (diff) | |
| download | upstream-2557d2eb4c41fd3fba080ee324e12091f8f53e97.tar.gz upstream-2557d2eb4c41fd3fba080ee324e12091f8f53e97.tar.bz2 upstream-2557d2eb4c41fd3fba080ee324e12091f8f53e97.zip | |
ipq40xx: merge all ar40xx patches into one single patch
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch')
| -rw-r--r-- | target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch b/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch deleted file mode 100644 index 19474bff0d..0000000000 --- a/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/drivers/net/phy/ar40xx.c -+++ b/drivers/net/phy/ar40xx.c -@@ -2021,6 +2021,12 @@ static int ar40xx_probe(struct platform_ - /* register switch */ - swdev = &priv->dev; - -+ if (priv->mii_bus == NULL) { -+ dev_err(&pdev->dev, "Probe failed - Missing PHYs!\n"); -+ ret = -ENODEV; -+ goto err_missing_phy; -+ } -+ - swdev->alias = dev_name(&priv->mii_bus->dev); - - swdev->cpu_port = AR40XX_PORT_CPU; -@@ -2052,6 +2058,7 @@ err_unregister_switch: - unregister_switch(&priv->dev); - err_unregister_phy: - phy_driver_unregister(&ar40xx_phy_driver); -+err_missing_phy: - platform_set_drvdata(pdev, NULL); - return ret; - } |