From: Greg Kroah-Hartman Date: Tue, 4 Jan 2022 07:34:24 +0000 (+0100) Subject: drop net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch from everywhere X-Git-Tag: v4.4.298~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dda648ba97a1d89526982e92abdba71b4cf289a9;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch from everywhere --- diff --git a/queue-5.10/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch b/queue-5.10/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch deleted file mode 100644 index a198c4efdc8..00000000000 --- a/queue-5.10/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8b25b224878f37718790360ac6b9bd106bcd0f4e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 24 Dec 2021 02:14:59 +0000 -Subject: net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in - __fixed_phy_register - -From: Miaoqian Lin - -[ Upstream commit b45396afa4177f2b1ddfeff7185da733fade1dc3 ] - -The fixed_phy_get_gpiod function() returns NULL, it doesn't return error -pointers, using NULL checking to fix this.i - -Fixes: 5468e82f7034 ("net: phy: fixed-phy: Drop GPIO from fixed_phy_add()") -Signed-off-by: Miaoqian Lin -Link: https://lore.kernel.org/r/20211224021500.10362-1-linmq006@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/phy/fixed_phy.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c -index 18d81f43f2a88..dd30a6883a027 100644 ---- a/drivers/net/phy/fixed_phy.c -+++ b/drivers/net/phy/fixed_phy.c -@@ -239,8 +239,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, - /* Check if we have a GPIO associated with this fixed phy */ - if (!gpiod) { - gpiod = fixed_phy_get_gpiod(np); -- if (IS_ERR(gpiod)) -- return ERR_CAST(gpiod); -+ if (!gpiod) -+ return ERR_PTR(-EINVAL); - } - - /* Get the next available PHY address, up to PHY_MAX_ADDR */ --- -2.34.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 9f09dc2a6f6..830b68edd27 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -13,7 +13,6 @@ net-mlx5e-wrap-the-tx-reporter-dump-callback-to-extr.patch net-mlx5e-fix-icosq-recovery-flow-for-xsk.patch udp-using-datalen-to-cap-ipv6-udp-max-gso-segments.patch selftests-calculate-udpgso-segment-count-without-hea.patch -net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch sctp-use-call_rcu-to-free-endpoint.patch net-smc-fix-using-of-uninitialized-completions.patch net-usb-pegasus-do-not-drop-long-ethernet-frames.patch diff --git a/queue-5.15/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch b/queue-5.15/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch deleted file mode 100644 index 0dab7ec97d9..00000000000 --- a/queue-5.15/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 818c9aa9da0404a2c39402486f8369462b84d392 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 24 Dec 2021 02:14:59 +0000 -Subject: net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in - __fixed_phy_register - -From: Miaoqian Lin - -[ Upstream commit b45396afa4177f2b1ddfeff7185da733fade1dc3 ] - -The fixed_phy_get_gpiod function() returns NULL, it doesn't return error -pointers, using NULL checking to fix this.i - -Fixes: 5468e82f7034 ("net: phy: fixed-phy: Drop GPIO from fixed_phy_add()") -Signed-off-by: Miaoqian Lin -Link: https://lore.kernel.org/r/20211224021500.10362-1-linmq006@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/phy/fixed_phy.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c -index c65fb5f5d2dc5..a0c256bd54417 100644 ---- a/drivers/net/phy/fixed_phy.c -+++ b/drivers/net/phy/fixed_phy.c -@@ -239,8 +239,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, - /* Check if we have a GPIO associated with this fixed phy */ - if (!gpiod) { - gpiod = fixed_phy_get_gpiod(np); -- if (IS_ERR(gpiod)) -- return ERR_CAST(gpiod); -+ if (!gpiod) -+ return ERR_PTR(-EINVAL); - } - - /* Get the next available PHY address, up to PHY_MAX_ADDR */ --- -2.34.1 - diff --git a/queue-5.15/series b/queue-5.15/series index af3242913cf..e98cf1235c2 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -25,7 +25,6 @@ net-mlx5e-use-tc-sample-stubs-instead-of-ifdefs-in-s.patch net-mlx5e-delete-forward-rule-for-ct-or-sample-actio.patch udp-using-datalen-to-cap-ipv6-udp-max-gso-segments.patch selftests-calculate-udpgso-segment-count-without-hea.patch -net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch sctp-use-call_rcu-to-free-endpoint.patch net-smc-fix-using-of-uninitialized-completions.patch net-usb-pegasus-do-not-drop-long-ethernet-frames.patch diff --git a/queue-5.4/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch b/queue-5.4/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch deleted file mode 100644 index 905ca13aece..00000000000 --- a/queue-5.4/net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 90d833556a0890bff159402c45c06a2fd171754c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 24 Dec 2021 02:14:59 +0000 -Subject: net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in - __fixed_phy_register - -From: Miaoqian Lin - -[ Upstream commit b45396afa4177f2b1ddfeff7185da733fade1dc3 ] - -The fixed_phy_get_gpiod function() returns NULL, it doesn't return error -pointers, using NULL checking to fix this.i - -Fixes: 5468e82f7034 ("net: phy: fixed-phy: Drop GPIO from fixed_phy_add()") -Signed-off-by: Miaoqian Lin -Link: https://lore.kernel.org/r/20211224021500.10362-1-linmq006@gmail.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/phy/fixed_phy.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c -index 4190f9ed5313d..9afb09c3eba1a 100644 ---- a/drivers/net/phy/fixed_phy.c -+++ b/drivers/net/phy/fixed_phy.c -@@ -245,8 +245,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, - /* Check if we have a GPIO associated with this fixed phy */ - if (!gpiod) { - gpiod = fixed_phy_get_gpiod(np); -- if (IS_ERR(gpiod)) -- return ERR_CAST(gpiod); -+ if (!gpiod) -+ return ERR_PTR(-EINVAL); - } - - /* Get the next available PHY address, up to PHY_MAX_ADDR */ --- -2.34.1 - diff --git a/queue-5.4/series b/queue-5.4/series index abb5cefb473..3bfee443def 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -11,7 +11,6 @@ scsi-lpfc-terminate-string-in-lpfc_debugfs_nvmeio_tr.patch net-mlx5-dr-fix-null-vs-is_err-checking-in-dr_domain.patch udp-using-datalen-to-cap-ipv6-udp-max-gso-segments.patch selftests-calculate-udpgso-segment-count-without-hea.patch -net-phy-fixed_phy-fix-null-vs-is_err-checking-in-__f.patch sctp-use-call_rcu-to-free-endpoint.patch net-usb-pegasus-do-not-drop-long-ethernet-frames.patch net-lantiq_xrx200-fix-statistics-of-received-bytes.patch