diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 10:13:41 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 10:13:41 +0200 |
| commit | 8becdc18c3e1f855cae5af266f6a1f5ce5af24fb (patch) | |
| tree | c42e2d4274b1aa17a7822385535ac8524e4a6822 /net/dsa/dsa.c | |
| parent | 3c1b5c9bd991d1c023f736b0187582aae8a5b30a (diff) | |
| parent | 030bbdbf4c833bc69f502eae58498bc5572db736 (diff) | |
Merge tag 'v4.1-rc3' into devel
Linux 4.1-rc3
Diffstat (limited to 'net/dsa/dsa.c')
| -rw-r--r-- | net/dsa/dsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 079a224471e7..e6f6cc3a1bcf 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -633,7 +633,7 @@ static int dsa_of_probe(struct device *dev) if (cd->sw_addr > PHY_MAX_ADDR) continue; - if (!of_property_read_u32(np, "eeprom-length", &eeprom_len)) + if (!of_property_read_u32(child, "eeprom-length", &eeprom_len)) cd->eeprom_len = eeprom_len; for_each_available_child_of_node(child, port) { |