diff --git a/[refs] b/[refs] index 2e5dce516571..2e72bf0f2377 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94de803db748b902a9442fcfd7aad31a2fde43b7 +refs/heads/master: 2447f2f3c38d3058d50de93df225ee6ad295932b diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c index 678222389407..8d0be26f94e3 100644 --- a/trunk/drivers/net/cpmac.c +++ b/trunk/drivers/net/cpmac.c @@ -1163,7 +1163,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) priv->dev = dev; priv->ring_size = 64; priv->msg_enable = netif_msg_init(debug_level, 0xff); - memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); + memcpy(dev->dev_addr, pdata->dev_addr, sizeof(pdata->dev_addr)); snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);