Commit 76b63da9 authored by David S. Miller's avatar David S. Miller

Merge branch 'dsa-of-parsing-fixes'

Florian Fainelli says:

====================
net: dsa: OF parsing fixes

This patch series fixes two small parsing issues, the first one was
reported by Dan, the second came after looking more closely at the
code.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2ee94014 c8cf89f7
...@@ -630,7 +630,7 @@ static int dsa_of_probe(struct device *dev) ...@@ -630,7 +630,7 @@ static int dsa_of_probe(struct device *dev)
continue; continue;
cd->sw_addr = be32_to_cpup(sw_addr); cd->sw_addr = be32_to_cpup(sw_addr);
if (cd->sw_addr > PHY_MAX_ADDR) if (cd->sw_addr >= PHY_MAX_ADDR)
continue; continue;
if (!of_property_read_u32(child, "eeprom-length", &eeprom_len)) if (!of_property_read_u32(child, "eeprom-length", &eeprom_len))
...@@ -642,6 +642,8 @@ static int dsa_of_probe(struct device *dev) ...@@ -642,6 +642,8 @@ static int dsa_of_probe(struct device *dev)
continue; continue;
port_index = be32_to_cpup(port_reg); port_index = be32_to_cpup(port_reg);
if (port_index >= DSA_MAX_PORTS)
break;
port_name = of_get_property(port, "label", NULL); port_name = of_get_property(port, "label", NULL);
if (!port_name) if (!port_name)
...@@ -666,8 +668,6 @@ static int dsa_of_probe(struct device *dev) ...@@ -666,8 +668,6 @@ static int dsa_of_probe(struct device *dev)
goto out_free_chip; goto out_free_chip;
} }
if (port_index == DSA_MAX_PORTS)
break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment