From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-la0-f47.google.com ([209.85.215.47]:36637 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932211AbbI3LXT (ORCPT ); Wed, 30 Sep 2015 07:23:19 -0400 Received: by laclj5 with SMTP id lj5so41872025lac.3 for ; Wed, 30 Sep 2015 04:23:17 -0700 (PDT) Subject: Re: [PATCH 3.16.y-ckt 081/133] stmmac: fix check for phydev being open To: Luis Henriques , linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com References: <1443606681-7124-1-git-send-email-luis.henriques@canonical.com> <1443606681-7124-82-git-send-email-luis.henriques@canonical.com> Cc: Giuseppe Cavallaro , David Miller , Alexey Brodkin From: Sergei Shtylyov Message-ID: <560BC625.1080309@cogentembedded.com> Date: Wed, 30 Sep 2015 14:23:17 +0300 MIME-Version: 1.0 In-Reply-To: <1443606681-7124-82-git-send-email-luis.henriques@canonical.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: On 9/30/2015 12:50 PM, Luis Henriques wrote: > 3.16.7-ckt18 -stable review patch. If anyone has any objections, please let me know. NAK on the same grounds as the 3.10 and 3.14 patches. > ------------------ > > 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: Luis Henriques > --- > 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 641086fc14b5..936cdee0c22e 100644 > --- 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_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