[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1413677606-31031-1-git-send-email-andrew@lunn.ch>
Date: Sun, 19 Oct 2014 02:13:26 +0200
From: Andrew Lunn <andrew@...n.ch>
To: davem@...emloft.net
Cc: f.fainelli@...il.com, netdev@...r.kernel.org,
Andrew Lunn <andrew@...n.ch>
Subject: [PATCH] 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 checking 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: Andrew Lunn <andrew@...n.ch>
Fixes: 6819563e646a "net: dsa: allow switch drivers to ...
Cc: Florian Fainelli <f.fainelli@...il.com>
---
net/dsa/slave.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 9d3b12b4e03c..fbcba4bc4e08 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -596,7 +596,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),
--
2.1.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists