From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Date: Wed, 30 Sep 2015 13:20:11 +0100
From: Luis Henriques <luis.henriques@canonical.com>
To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	kernel-team@lists.ubuntu.com,
	Giuseppe Cavallaro <peppe.cavallaro@st.com>,
	David Miller <davem@davemloft.net>,
	Alexey Brodkin <abrodkin@synopsys.com>
Subject: Re: [PATCH 3.16.y-ckt 081/133] stmmac: fix check for phydev being
 open
Message-ID: <20150930122011.GA10819@ares>
References: <1443606681-7124-1-git-send-email-luis.henriques@canonical.com>
 <1443606681-7124-82-git-send-email-luis.henriques@canonical.com>
 <560BC625.1080309@cogentembedded.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <560BC625.1080309@cogentembedded.com>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Wed, Sep 30, 2015 at 02:23:17PM +0300, Sergei Shtylyov wrote:
> 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.
>

Ok, makes sense -- dropping this patch from the 3.16 queue.  Thanks!

Cheers,
--
Lu�s

> >------------------
> >
> >From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> >
> >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: Luis Henriques <luis.henriques@canonical.com>
> >---
> >  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
>