lkml.org 
[lkml]   [2019]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 10/32] net: phy: xgmiitorgmii: Support generic PHY status read
    Date
    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 <paul.kocialkowski@bootlin.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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


    \
     
     \ /
      Last update: 2019-02-21 15:45    [W:3.461 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site