From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Jiri Slaby <jslaby@suse.cz>, stable@vger.kernel.org
Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
linux-kernel@vger.kernel.org, David Miller <davem@davemloft.net>,
Alexey Brodkin <abrodkin@synopsys.com>
Subject: Re: [patch added to the 3.12 stable tree] stmmac: fix check for phydev being open
Date: Wed, 30 Sep 2015 14:28:23 +0300 [thread overview]
Message-ID: <560BC757.1010605@cogentembedded.com> (raw)
In-Reply-To: <1443607226-15456-18-git-send-email-jslaby@suse.cz>
On 9/30/2015 1:00 PM, Jiri Slaby wrote:
> From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> This patch has been added to the 3.12 stable tree. If you have any
> objections, please let us know.
I do -- of_phy_connect() isn't called in this version, so the patch is
totally useless.
> ===============
>
> 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 <sergei.shtylyov@cogentembedded.com>
> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: David Miller <davem@davemloft.net>
> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 8d4ccd35a016..14c0d31c10ad 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -801,8 +801,11 @@ static int stmmac_init_phy(struct net_device *dev)
>
> 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);
> }
>
MBR, Sergei
next prev parent reply other threads:[~2015-09-30 11:28 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 9:59 [patch added to the 3.12 stable tree] rc-core: fix remove uevent generation Jiri Slaby
2015-09-30 9:59 ` [patch added to the 3.12 stable tree] v4l: omap3isp: Fix sub-device power management code Jiri Slaby
2015-09-30 9:59 ` [patch added to the 3.12 stable tree] Btrfs: check if previous transaction aborted to avoid fs corruption Jiri Slaby
2015-09-30 9:59 ` [patch added to the 3.12 stable tree] NFSv4: don't set SETATTR for O_RDONLY|O_EXCL Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] NFS: nfs_set_pgio_error sometimes misses errors Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] parisc: Filter out spurious interrupts in PA-RISC irq handler Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] vmscan: fix increasing nr_isolated incurred by putback unevictable pages Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] fs: if a coredump already exists, unlink and recreate with O_EXCL Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] mmc: core: fix race condition in mmc_wait_data_done Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] md/raid10: always set reshape_safe when initializing reshape_position Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] xen/gntdev: convert priv->lock to a mutex Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] hfs: fix B-tree corruption after insertion at position 0 Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] IB/qib: Change lkey table allocation to support more MRs Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] IB/uverbs: reject invalid or unknown opcodes Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] IB/uverbs: Fix race between ib_uverbs_open and remove_one Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] IB/mlx4: Forbid using sysfs to change RoCE pkeys Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] IB/mlx4: Use correct SL on AH query under RoCE Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] stmmac: fix check for phydev being open Jiri Slaby
2015-09-30 11:28 ` Sergei Shtylyov [this message]
2015-09-30 11:47 ` Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] stmmac: troubleshoot unexpected bits in des0 & des1 Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] hfs,hfsplus: cache pages correctly between bnode_create and bnode_free Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] ip6_gre: release cached dst on tunnel removal Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] usbnet: Get EVENT_NO_RUNTIME_PM bit before it is cleared Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] ipv6: fix exthdrs offload registration in out_rt path Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] net/ipv6: Correct PIM6 mrt_lock handling Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] netlink, mmap: transform mmap skb into full skb on taps Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] sctp: fix race on protocol/netns initialization Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] openvswitch: Zero flows on allocation Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] fib_rules: fix fib rule dumps across multiple skbs Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] x86/nmi/64: Improve nested NMI comments Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] x86/nmi/64: Reorder nested NMI checks Jiri Slaby
2015-09-30 10:00 ` [patch added to the 3.12 stable tree] x86/nmi/64: Use DF to avoid userspace RSP confusing nested NMI detection Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=560BC757.1010605@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=abrodkin@synopsys.com \
--cc=davem@davemloft.net \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).