net: phy: micrel: Allow probing without .driver_data

[ 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>

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 755aa674129232735f18939b47e10ec963058b92..6f15cd5d4e7a29f09199c85461ed99c9994f4474 100644 (file)
--- 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);
@@ -764,7 +764,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)
@@ -785,7 +785,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");