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

Commit 228b16cb authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

Net: DSA: Fix checking for get_phy_flags function 



The check for the presence or not of the optional switch function
get_phy_flags() called the function, rather than checked to see if it
is a NULL pointer. This causes a derefernce of a NULL pointer on all
switch chips except the sf2, the only switch to implement this call.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Fixes: 6819563e ("net: dsa: allow switch drivers to specify phy_device::dev_flags")
Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6d4518d

net/dsa/slave.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent, 
	netif_carrier_off(slave_dev);



	if (p->phy != NULL) {

		if (ds->drv->get_phy_flags(ds, port))

		if (ds->drv->get_phy_flags)

			p->phy->dev_flags |= ds->drv->get_phy_flags(ds, port);



		phy_attach(slave_dev, dev_name(&p->phy->dev),