Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e5fbfc2 authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman
Browse files

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: default avatarFabio Estevam <festevam@denx.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220513114613.762810-1-festevam@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9d1764b9

drivers/net/phy/micrel.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -282,7 +282,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);

		kszphy_setup_led(phydev, priv->type->led_mode_reg, priv->led_mode);





	return 0;

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




	type = priv->type;

	type = priv->type;





	if (type->has_broadcast_disable)

	if (type && type->has_broadcast_disable)

		kszphy_broadcast_disable(phydev);

		kszphy_broadcast_disable(phydev);





	if (type->has_nand_tree_disable)

	if (type && type->has_nand_tree_disable)

		kszphy_nand_tree_disable(phydev);

		kszphy_nand_tree_disable(phydev);





	return kszphy_config_reset(phydev);

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




	priv->type = type;

	priv->type = type;





	if (type->led_mode_reg) {

	if (type && type->led_mode_reg) {

		ret = of_property_read_u32(np, "micrel,led-mode",

		ret = of_property_read_u32(np, "micrel,led-mode",

				&priv->led_mode);

				&priv->led_mode);

		if (ret)

		if (ret)
@@ -960,6 +960,7 @@ static int kszphy_probe(struct phy_device *phydev) 
		unsigned long rate = clk_get_rate(clk);

		unsigned long rate = clk_get_rate(clk);

		bool rmii_ref_clk_sel_25_mhz;

		bool rmii_ref_clk_sel_25_mhz;





		if (type)

			priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel;

			priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel;

		rmii_ref_clk_sel_25_mhz = of_property_read_bool(np,

		rmii_ref_clk_sel_25_mhz = of_property_read_bool(np,

				"micrel,rmii-reference-clock-select-25-mhz");

				"micrel,rmii-reference-clock-select-25-mhz");