From: Greg Kroah-Hartman Date: Thu, 1 Oct 2015 03:04:56 +0000 (+0200) Subject: remove stmmac-fix-check-for-phydev-being-open.patch from 3.10 and 3.14 trees X-Git-Tag: v3.14.54~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f50548ee0c16bb6e1b4a73b03edc2b81dc19fbed;p=thirdparty%2Fkernel%2Fstable-queue.git remove stmmac-fix-check-for-phydev-being-open.patch from 3.10 and 3.14 trees --- diff --git a/queue-3.10/series b/queue-3.10/series index 27809ef210d..19ef081f6fe 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -25,7 +25,6 @@ ib-uverbs-reject-invalid-or-unknown-opcodes.patch ib-uverbs-fix-race-between-ib_uverbs_open-and-remove_one.patch ib-mlx4-forbid-using-sysfs-to-change-roce-pkeys.patch ib-mlx4-use-correct-sl-on-ah-query-under-roce.patch -stmmac-fix-check-for-phydev-being-open.patch hfs-hfsplus-cache-pages-correctly-between-bnode_create-and-bnode_free.patch sctp-fix-asconf-list-handling.patch vhost-scsi-potential-memory-corruption.patch diff --git a/queue-3.10/stmmac-fix-check-for-phydev-being-open.patch b/queue-3.10/stmmac-fix-check-for-phydev-being-open.patch deleted file mode 100644 index 3bb50f6145f..00000000000 --- a/queue-3.10/stmmac-fix-check-for-phydev-being-open.patch +++ /dev/null @@ -1,43 +0,0 @@ -From dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Wed, 9 Sep 2015 18:01:08 +0300 -Subject: stmmac: fix check for phydev being open - -From: Alexey Brodkin - -commit dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 upstream. - -Current check of phydev with IS_ERR(phydev) may make not much sense -because of_phy_connect() returns NULL on failure instead of error value. - -Still for checking result of phy_connect() IS_ERR() makes perfect sense. - -So let's use combined check IS_ERR_OR_NULL() that covers both cases. - -Cc: Sergei Shtylyov -Cc: Giuseppe Cavallaro -Cc: linux-kernel@vger.kernel.org -Cc: David Miller -Signed-off-by: Alexey Brodkin -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -834,8 +834,11 @@ static int stmmac_init_phy(struct net_de - - phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, interface); - -- if (IS_ERR(phydev)) { -+ if (IS_ERR_OR_NULL(phydev)) { - pr_err("%s: Could not attach to PHY\n", dev->name); -+ if (!phydev) -+ return -ENODEV; -+ - return PTR_ERR(phydev); - } - diff --git a/queue-3.14/series b/queue-3.14/series index b87be4ab520..59b07198b16 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -37,7 +37,6 @@ ib-uverbs-reject-invalid-or-unknown-opcodes.patch ib-uverbs-fix-race-between-ib_uverbs_open-and-remove_one.patch ib-mlx4-forbid-using-sysfs-to-change-roce-pkeys.patch ib-mlx4-use-correct-sl-on-ah-query-under-roce.patch -stmmac-fix-check-for-phydev-being-open.patch stmmac-troubleshoot-unexpected-bits-in-des0-des1.patch hfs-hfsplus-cache-pages-correctly-between-bnode_create-and-bnode_free.patch ipv6-make-mld-packets-to-only-be-processed-locally.patch diff --git a/queue-3.14/stmmac-fix-check-for-phydev-being-open.patch b/queue-3.14/stmmac-fix-check-for-phydev-being-open.patch deleted file mode 100644 index 992c1ad52c2..00000000000 --- a/queue-3.14/stmmac-fix-check-for-phydev-being-open.patch +++ /dev/null @@ -1,43 +0,0 @@ -From dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Wed, 9 Sep 2015 18:01:08 +0300 -Subject: stmmac: fix check for phydev being open - -From: Alexey Brodkin - -commit dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 upstream. - -Current check of phydev with IS_ERR(phydev) may make not much sense -because of_phy_connect() returns NULL on failure instead of error value. - -Still for checking result of phy_connect() IS_ERR() makes perfect sense. - -So let's use combined check IS_ERR_OR_NULL() that covers both cases. - -Cc: Sergei Shtylyov -Cc: Giuseppe Cavallaro -Cc: linux-kernel@vger.kernel.org -Cc: David Miller -Signed-off-by: Alexey Brodkin -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -810,8 +810,11 @@ static int stmmac_init_phy(struct net_de - - phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, interface); - -- if (IS_ERR(phydev)) { -+ if (IS_ERR_OR_NULL(phydev)) { - pr_err("%s: Could not attach to PHY\n", dev->name); -+ if (!phydev) -+ return -ENODEV; -+ - return PTR_ERR(phydev); - } -