From 08371a2db76ecba5236ae8aec1d57fee84e312d8 Mon Sep 17 00:00:00 2001 From: Tim Harvey Date: Thu, 9 Mar 2017 16:04:38 -0800 Subject: [PATCH] kernel: fix phy aneg crash Fix a kernel crash caused when CONFIG_FIXED_PHY used for fixed phy drivers in phy-add-aneg-done-function patch. Signed-off-by: Tim Harvey --- .../generic/patches-3.18/702-phy_add_aneg_done_function.patch | 2 +- .../generic/patches-4.4/702-phy_add_aneg_done_function.patch | 2 +- .../generic/patches-4.9/702-phy_add_aneg_done_function.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch index d20fc04cb07..bc9515217ac 100644 --- a/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch @@ -19,7 +19,7 @@ { int status; -+ if (phydev->drv->update_link) ++ if (phydev->drv && phydev->drv->update_link) + return phydev->drv->update_link(phydev); + /* Do a fake read */ diff --git a/target/linux/generic/patches-4.4/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-4.4/702-phy_add_aneg_done_function.patch index f16efa495e3..39ac22f1adf 100644 --- a/target/linux/generic/patches-4.4/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/patches-4.4/702-phy_add_aneg_done_function.patch @@ -19,7 +19,7 @@ { int status; -+ if (phydev->drv->update_link) ++ if (phydev->drv && phydev->drv->update_link) + return phydev->drv->update_link(phydev); + /* Do a fake read */ diff --git a/target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch index 410cd43067f..d38212da7b3 100644 --- a/target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch @@ -19,7 +19,7 @@ { int status; -+ if (phydev->drv->update_link) ++ if (phydev->drv && phydev->drv->update_link) + return phydev->drv->update_link(phydev); + /* Do a fake read */ -- 2.30.2