From 8e515a39805c013229698e1a142e16701f07edf9 Mon Sep 17 00:00:00 2001 From: Alex Marginean Date: Tue, 7 Jan 2020 16:50:31 +0200 Subject: [PATCH] drivers: net: phy: don't crash in phy_read/_write_mmd without a PHY driver The APIs can be used by Ethernet drivers to configure internal PHYs without actually loading a PHY driver. Check that drv is not NULL before reading from it. Signed-off-by: Alex Marginean --- drivers/net/phy/phy-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c @@ -379,7 +379,7 @@ int __phy_read_mmd(struct phy_device *ph if (regnum > (u16)~0 || devad > 32) return -EINVAL; - if (phydev->drv->read_mmd) { + if (phydev->drv && phydev->drv->read_mmd) { val = phydev->drv->read_mmd(phydev, devad, regnum); } else if (phydev->is_c45) { u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0xffff); @@ -436,7 +436,7 @@ int __phy_write_mmd(struct phy_device *p if (regnum > (u16)~0 || devad > 32) return -EINVAL; - if (phydev->drv->write_mmd) { + if (phydev->drv && phydev->drv->write_mmd) { ret = phydev->drv->write_mmd(phydev, devad, regnum, val); } else if (phydev->is_c45) { u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0xffff); aster'>less-old-master upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0353-staging-fsl-dpaa2-mac-do-not-stop-MAC-when-the-net_d.patch
blob: 80bb697edf316f6e2e8f03c6059e56e43cff76ad (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65