From patchwork Sat Apr 30 22:47:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 617131 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 3qy5LS4Nh7z9t9d for ; Sun, 1 May 2016 08:47:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b=LliL6L0p; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752293AbcD3Wrm (ORCPT ); Sat, 30 Apr 2016 18:47:42 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:34115 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752225AbcD3Wrl (ORCPT ); Sat, 30 Apr 2016 18:47:41 -0400 Received: by mail-lf0-f43.google.com with SMTP id j11so175073600lfb.1 for ; Sat, 30 Apr 2016 15:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:organization:user-agent :mime-version:content-transfer-encoding; bh=Ez1ks/G8F2MlSOwxtJZhlGx0xb3Wj+rcLyMDWlxXTfo=; b=LliL6L0p+PVmLTDvWVGvG3uUg4NJBZ8NdUCYKM76Ig3JOGlu/nmliaW/G64i3ot/ms Syn9ITmLx1QvUWIBSsDukcLat0MoapB1JE/1fHoS318qa6n3fB2gj/7/Gzg5O/XFHHIS mkAdiZed6udfpHqb7I20uiT1i24mGp0cGfYY7+2T63luN1WEWlfN0EVTfxIOEUaoeK3r jqKq73xKc9aVillVOS5NQawu/JVkth0q2B+IL2OxSWgkp3NXhMXV47QDTbo0e+GGh07z zMeTN1iTimabj8EUvmZxhsM7PTwX2TNc+yKSxr/IsYEpAtsDCfUb517XXZL3EO3UMamB K+jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:organization :user-agent:mime-version:content-transfer-encoding; bh=Ez1ks/G8F2MlSOwxtJZhlGx0xb3Wj+rcLyMDWlxXTfo=; b=UtC+o5X+ivyMBsUGH9iRL1Hts484hhlAbb6hsr5+MGR0PZ5syAXwsG85H1Uj3o4YrV uQ8ZdtuinrtZels2kC4ZcNFJpeUciX60S/v6PRgjy5+7I8a/X0xiaub2PX9tB3WngNll ZOZZIVhf3eTKR5w7e9cL/pBjjigJkzFpGe8YGiiZenQQA2Nz84MWHRR6A557/w06S+X/ m8acuOayAwpty8aWcsNs9sffGLYNTulqrBAxnS9rimR4oLQCeI7fgKkfkTr90xVAb5oj /BEhdsuOTcr/1SpNKr0ewtgm48TdEHILzf/orB5ZkBFm1+k1nEMHJF6g2HWtdOXP+S0i X9rw== X-Gm-Message-State: AOPr4FWBqRoCnI27T5agBukCjv/L3ovcpSJOI79zM8Woisr7i5f4l3Ich6+OU9te4h1Vlg== X-Received: by 10.112.172.199 with SMTP id be7mr11921742lbc.49.1462056459443; Sat, 30 Apr 2016 15:47:39 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.87.228]) by smtp.gmail.com with ESMTPSA id s4sm3209169lbr.34.2016.04.30.15.47.38 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 30 Apr 2016 15:47:38 -0700 (PDT) From: Sergei Shtylyov To: netdev@vger.kernel.org, nicolas.ferre@atmel.com Subject: [PATCH] macb: fix mdiobus_scan() error check Date: Sun, 01 May 2016 01:47:36 +0300 Message-ID: <2317306.aZN9iKAKYz@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.10 (Linux/4.4.6-201.fc22.x86_64; KDE/4.14.17; x86_64; ; ) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now mdiobus_scan() returns ERR_PTR(-ENODEV) instead of NULL if the PHY device ID was read as all ones. As this was not an error before, this value should be filtered out now in this driver. Fixes: b74766a0a0fe ("phylib: don't return NULL from get_phy_device()") Signed-off-by: Sergei Shtylyov Reviewed-by: Florian Fainelli Acked-by: Nicolas Ferre --- The patch is against DaveM's 'net-next.git' repo. drivers/net/ethernet/cadence/macb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: net-next/drivers/net/ethernet/cadence/macb.c =================================================================== --- net-next.orig/drivers/net/ethernet/cadence/macb.c +++ net-next/drivers/net/ethernet/cadence/macb.c @@ -458,7 +458,8 @@ static int macb_mii_init(struct macb *bp struct phy_device *phydev; phydev = mdiobus_scan(bp->mii_bus, i); - if (IS_ERR(phydev)) { + if (IS_ERR(phydev) && + PTR_ERR(phydev) != -ENODEV) { err = PTR_ERR(phydev); break; }