aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Harvey <tharvey@gateworks.com>2017-03-09 16:04:38 -0800
committerFelix Fietkau <nbd@nbd.name>2017-03-12 11:58:45 +0100
commit08371a2db76ecba5236ae8aec1d57fee84e312d8 (patch)
treedcc558f51505cb4a27c27173a3609994ebb5ea0c
parent11eac705c52402ff68246a52cce566b2a1776ae1 (diff)
downloadupstream-08371a2db76ecba5236ae8aec1d57fee84e312d8.tar.gz
upstream-08371a2db76ecba5236ae8aec1d57fee84e312d8.tar.bz2
upstream-08371a2db76ecba5236ae8aec1d57fee84e312d8.zip
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 <tharvey@gateworks.com>
-rw-r--r--target/linux/generic/patches-3.18/702-phy_add_aneg_done_function.patch2
-rw-r--r--target/linux/generic/patches-4.4/702-phy_add_aneg_done_function.patch2
-rw-r--r--target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch2
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 d20fc04cb0..bc9515217a 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 f16efa495e..39ac22f1ad 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 410cd43067..d38212da7b 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 */