Skip to content

Commit 035a14e

Browse files
kengiterdavem330
authored andcommitted
net: sh_eth: fix a missing check of of_get_phy_mode
of_get_phy_mode may fail and return a negative error code; the fix checks the return value of of_get_phy_mode and returns NULL of it fails. Fixes: b356e97 ("sh_eth: add device tree support") Signed-off-by: Kangjie Lu <kjlu@umn.edu> Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent c7cbc3e commit 035a14e

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/net/ethernet/renesas/sh_eth.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3181,12 +3181,16 @@ static struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)
31813181
struct device_node *np = dev->of_node;
31823182
struct sh_eth_plat_data *pdata;
31833183
const char *mac_addr;
3184+
int ret;
31843185

31853186
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
31863187
if (!pdata)
31873188
return NULL;
31883189

3189-
pdata->phy_interface = of_get_phy_mode(np);
3190+
ret = of_get_phy_mode(np);
3191+
if (ret < 0)
3192+
return NULL;
3193+
pdata->phy_interface = ret;
31903194

31913195
mac_addr = of_get_mac_address(np);
31923196
if (mac_addr)

0 commit comments

Comments
 (0)