summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ti
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-03-22 12:53:09 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-22 12:53:09 -0400
commitea3d1cc285bf1ae1fa81b47418cd7fd79990bb06 (patch)
treea5b4cd52ec5e27d169bf3115d732d2106bc78fc2 /drivers/net/ethernet/ti
parent2fa70df935585479f974766d84fa68af462a25a5 (diff)
parentf4541d60a449afd40448b06496dcd510f505928e (diff)
downloadblackbird-op-linux-ea3d1cc285bf1ae1fa81b47418cd7fd79990bb06.tar.gz
blackbird-op-linux-ea3d1cc285bf1ae1fa81b47418cd7fd79990bb06.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull to get the thermal netlink multicast group name fix, otherwise the assertion added in net-next to netlink to detect that kind of bug makes systems unbootable for some folks. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
-rw-r--r--drivers/net/ethernet/ti/cpsw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 5ceaa4c3cfa5..7aebc0cb35e1 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1504,7 +1504,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
struct platform_device *mdio;
parp = of_get_property(slave_node, "phy_id", &lenp);
- if ((parp == NULL) && (lenp != (sizeof(void *) * 2))) {
+ if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {
pr_err("Missing slave[%d] phy_id property\n", i);
ret = -EINVAL;
goto error_ret;
OpenPOWER on IntegriCloud