From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail-la0-f50.google.com ([209.85.215.50]:34492 "EHLO
	mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756452AbbI3LUx (ORCPT
	<rfc822;stable@vger.kernel.org>); Wed, 30 Sep 2015 07:20:53 -0400
Received: by labzv5 with SMTP id zv5so42026730lab.1
        for <stable@vger.kernel.org>; Wed, 30 Sep 2015 04:20:52 -0700 (PDT)
Subject: Re: [PATCH 3.10 29/56] stmmac: fix check for phydev being open
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-kernel@vger.kernel.org
References: <20150929134700.376714360@linuxfoundation.org>
 <20150929134701.668360721@linuxfoundation.org>
Cc: stable@vger.kernel.org,
	Giuseppe Cavallaro <peppe.cavallaro@st.com>,
	David Miller <davem@davemloft.net>,
	Alexey Brodkin <abrodkin@synopsys.com>
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Message-ID: <560BC593.7010305@cogentembedded.com>
Date: Wed, 30 Sep 2015 14:20:51 +0300
MIME-Version: 1.0
In-Reply-To: <20150929134701.668360721@linuxfoundation.org>
Content-Type: text/plain; charset=iso-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

Hello.

On 9/29/2015 4:47 PM, Greg Kroah-Hartman wrote:

> 3.10-stable review patch.  If anyone has any objections, please let me know.

    I do! Just noticed...

> ------------------
>
> 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
>   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);

    This kernel version obviously doesn't have the device tree probing in this 
driver yet, so of_phy_connect() isn't called and the patch doesn't make sense.

>
> -	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