From patchwork Tue Sep 8 08:43:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 515315 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48930140187 for ; Tue, 8 Sep 2015 19:00:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754203AbbIHJAN (ORCPT ); Tue, 8 Sep 2015 05:00:13 -0400 Received: from us01smtprelay-2.synopsys.com ([198.182.47.9]:44417 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753264AbbIHJAI (ORCPT ); Tue, 8 Sep 2015 05:00:08 -0400 Received: from dc8secmta2.synopsys.com (dc8secmta2.synopsys.com [10.13.218.202]) by smtprelay.synopsys.com (Postfix) with ESMTP id 3E76124E095E; Tue, 8 Sep 2015 01:59:59 -0700 (PDT) Received: from dc8secmta2.internal.synopsys.com (dc8secmta2.internal.synopsys.com [127.0.0.1]) by dc8secmta2.internal.synopsys.com (Service) with ESMTP id 7D317A4112; Tue, 8 Sep 2015 01:59:59 -0700 (PDT) Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by dc8secmta2.internal.synopsys.com (Service) with ESMTP id 4B5A1A4102; Tue, 8 Sep 2015 01:59:59 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id BBFC23C5; Tue, 8 Sep 2015 01:44:06 -0700 (PDT) Received: from abrodkin-e7440l.internal.synopsys.com (unknown [10.225.15.67]) by mailhost.synopsys.com (Postfix) with ESMTP id 77ED8128; Tue, 8 Sep 2015 01:43:12 -0700 (PDT) From: Alexey Brodkin To: netdev@vger.kernel.org Cc: Alexey Brodkin , Sergei Shtylyov , Giuseppe Cavallaro , linux-kernel@vger.kernel.org, stable@vger.kernel.org, David Miller Subject: [PATCH v3] stmmac: fix check for phydev being open Date: Tue, 8 Sep 2015 11:43:06 +0300 Message-Id: <1441701786-10789-1-git-send-email-abrodkin@synopsys.com> X-Mailer: git-send-email 2.4.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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: stable@vger.kernel.org Cc: David Miller Signed-off-by: Alexey Brodkin --- Changes compared to v2: * Updated commit message with mention of of_phy_connect() instead of of_phy_attach(). * Return ENODEV in case of of_phy_connect() failure Changes compared to v1: * Use IS_ERR_OR_NULL() instead of discrete checks for null and err drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 864b476..e2c9c86 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -837,9 +837,12 @@ static int stmmac_init_phy(struct net_device *dev) interface); } - if (IS_ERR(phydev)) { + if (IS_ERR_OR_NULL(phydev)) { pr_err("%s: Could not attach to PHY\n", dev->name); - return PTR_ERR(phydev); + if (!phydev) + return -ENODEV; + else + return PTR_ERR(phydev); } /* Stop Advertising 1000BASE Capability if interface is not GMII */