lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 039/287] net: phy: micrel: Allow probing without .driver_data
    Date
    From: Fabio Estevam <festevam@denx.de>

    [ Upstream commit f2ef6f7539c68c6bd6c32323d8845ee102b7c450 ]

    Currently, if the .probe element is present in the phy_driver structure
    and the .driver_data is not, a NULL pointer dereference happens.

    Allow passing .probe without .driver_data by inserting NULL checks
    for priv->type.

    Signed-off-by: Fabio Estevam <festevam@denx.de>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Link: https://lore.kernel.org/r/20220513114613.762810-1-festevam@gmail.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/phy/micrel.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
    index 013590330059..1d00a563892a 100644
    --- a/drivers/net/phy/micrel.c
    +++ b/drivers/net/phy/micrel.c
    @@ -285,7 +285,7 @@ static int kszphy_config_reset(struct phy_device *phydev)
    }
    }

    - if (priv->led_mode >= 0)
    + if (priv->type && priv->led_mode >= 0)
    kszphy_setup_led(phydev, priv->type->led_mode_reg, priv->led_mode);

    return 0;
    @@ -301,10 +301,10 @@ static int kszphy_config_init(struct phy_device *phydev)

    type = priv->type;

    - if (type->has_broadcast_disable)
    + if (type && type->has_broadcast_disable)
    kszphy_broadcast_disable(phydev);

    - if (type->has_nand_tree_disable)
    + if (type && type->has_nand_tree_disable)
    kszphy_nand_tree_disable(phydev);

    return kszphy_config_reset(phydev);
    @@ -775,7 +775,7 @@ static int kszphy_probe(struct phy_device *phydev)

    priv->type = type;

    - if (type->led_mode_reg) {
    + if (type && type->led_mode_reg) {
    ret = of_property_read_u32(np, "micrel,led-mode",
    &priv->led_mode);
    if (ret)
    @@ -796,7 +796,8 @@ static int kszphy_probe(struct phy_device *phydev)
    unsigned long rate = clk_get_rate(clk);
    bool rmii_ref_clk_sel_25_mhz;

    - priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel;
    + if (type)
    + priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel;
    rmii_ref_clk_sel_25_mhz = of_property_read_bool(np,
    "micrel,rmii-reference-clock-select-25-mhz");

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 13:49    [W:4.083 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site