From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04BECC43381 for ; Thu, 21 Feb 2019 14:43:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7B6E2080D for ; Thu, 21 Feb 2019 14:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760227; bh=rr532KoEscbZIomOA/ITsJsmYvMlzvud72uA2TSHD1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tePJCUU/1qGQnU0QFhMVFU4zLZeGjfDH/d8B4Np8nRMytMQns7UixVwFu8j53f8k0 RBrJXnunA3Y17vYTw+rqI6PAj2zpLBY8RQ7gS4vZRh/KC70EcHskrZXdRI+tLh5oN8 rup3vCCS3d85WYuHdfZ+CDcIyXVxn2DHWA01PBPY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727871AbfBUOnq (ORCPT ); Thu, 21 Feb 2019 09:43:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:39734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729765AbfBUOnn (ORCPT ); Thu, 21 Feb 2019 09:43:43 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C7E862075A; Thu, 21 Feb 2019 14:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760223; bh=rr532KoEscbZIomOA/ITsJsmYvMlzvud72uA2TSHD1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AJvTD4PRSc8QjZ+n8em/MTi5Lmrp9T6hKz1V3IlPrp265AeU0/4oVz6xRS4PV4RGC ao5BcaLeJ/oeq7bD6JDPSWV9OJbbSsJF4be+eAWCxQTeiTggPjxM6qbXxp9TXlVash hTztKehbuSFVh5N0QdwDQIaY0uulS9qUhM57h33o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Kocialkowski , "David S. Miller" , Sasha Levin Subject: [PATCH 4.20 10/32] net: phy: xgmiitorgmii: Support generic PHY status read Date: Thu, 21 Feb 2019 15:35:58 +0100 Message-Id: <20190221125251.442375907@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221125250.855065214@linuxfoundation.org> References: <20190221125250.855065214@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 197f9ab7f08ce4b9ece662f747c3991b2f0fbb57 ] Some PHY drivers like the generic one do not provide a read_status callback on their own but rely on genphy_read_status being called directly. With the current code, this results in a NULL function pointer call. Call genphy_read_status instead when there is no specific callback. Fixes: f411a6160bd4 ("net: phy: Add gmiitorgmii converter support") Signed-off-by: Paul Kocialkowski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/xilinx_gmii2rgmii.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c index 74a8782313cf5..bd6084e315de2 100644 --- a/drivers/net/phy/xilinx_gmii2rgmii.c +++ b/drivers/net/phy/xilinx_gmii2rgmii.c @@ -44,7 +44,10 @@ static int xgmiitorgmii_read_status(struct phy_device *phydev) u16 val = 0; int err; - err = priv->phy_drv->read_status(phydev); + if (priv->phy_drv->read_status) + err = priv->phy_drv->read_status(phydev); + else + err = genphy_read_status(phydev); if (err < 0) return err; -- 2.19.1