diff options
Diffstat (limited to 'drivers/net/sunhme.c')
| -rw-r--r-- | drivers/net/sunhme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 0970e1774d13..6762f1c6ec8a 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
| @@ -3056,9 +3056,9 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, | |||
| 3056 | int len; | 3056 | int len; |
| 3057 | 3057 | ||
| 3058 | if (qfe_slot != -1 && | 3058 | if (qfe_slot != -1 && |
| 3059 | (addr = of_get_property(dp, | 3059 | (addr = of_get_property(dp, "local-mac-address", &len)) |
| 3060 | "local-mac-address", &len)) != NULL | 3060 | != NULL && |
| 3061 | && len == 6) { | 3061 | len == 6) { |
| 3062 | memcpy(dev->dev_addr, addr, 6); | 3062 | memcpy(dev->dev_addr, addr, 6); |
| 3063 | } else { | 3063 | } else { |
| 3064 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); | 3064 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); |