net: phy: micrel: Allow probing without .driver_data

[ Upstream commit f2ef6f7539 ]

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>
This commit is contained in:
Fabio Estevam 2022-05-13 08:46:12 -03:00 коммит произвёл Greg Kroah-Hartman
Родитель 5005002b2e
Коммит 660dfa033c
1 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -335,7 +335,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;
@ -351,10 +351,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);
@ -1328,7 +1328,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)
@ -1349,6 +1349,7 @@ static int kszphy_probe(struct phy_device *phydev)
unsigned long rate = clk_get_rate(clk);
bool rmii_ref_clk_sel_25_mhz;
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");