From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751773AbbJSW5t (ORCPT ); Mon, 19 Oct 2015 18:57:49 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:33114 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751608AbbJSW5s (ORCPT ); Mon, 19 Oct 2015 18:57:48 -0400 Subject: Re: [3.19.y-ckt stable] Patch "stmmac: fix check for phydev being open" has been added to staging queue To: Kamal Mostafa , Alexey Brodkin References: <1445294409-18054-1-git-send-email-kamal@canonical.com> Cc: Giuseppe Cavallaro , linux-kernel@vger.kernel.org, David Miller , Alexey Brodkin , kernel-team@lists.ubuntu.com From: Sergei Shtylyov Organization: Cogent Embedded Message-ID: <56257568.4030706@cogentembedded.com> Date: Tue, 20 Oct 2015 01:57:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <1445294409-18054-1-git-send-email-kamal@canonical.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello. On 10/20/2015 01:40 AM, Kamal Mostafa wrote: > This is a note to let you know that I have just added a patch titled > > stmmac: fix check for phydev being open > > to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree > which can be found at: > > http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue > > This patch is scheduled to be released in version 3.19.8-ckt8. > > If you, or anyone else, feels it should not be added to this tree, please > reply to this email. > > For more information about the 3.19.y-ckt tree, see > https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Uh oh, it happened again... :-( NAK. > Thanks. > -Kamal > > ------ > > From ba01d7935fb4710b33ccc217b8e9a9cce88e1d75 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 > > 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. of_phy_connect() insn't called yet in 3.19 as should be obvious from the patch context. > 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: Kamal Mostafa > --- > 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 8834b82..5b9d3f7 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -829,8 +829,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); > } > > -- > 1.9.1 MBR, Sergei