diff --git a/[refs] b/[refs] index a3d959a2d325..8b277a29c41a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8269a495a1924f8b023532dd3e77423432db810 +refs/heads/master: 2cc002c4bbce4d918ab94b494d61c6991c907d5e diff --git a/trunk/drivers/net/netx-eth.c b/trunk/drivers/net/netx-eth.c index b9bed82e1d21..b289a0a2b945 100644 --- a/trunk/drivers/net/netx-eth.c +++ b/trunk/drivers/net/netx-eth.c @@ -401,6 +401,8 @@ static int netx_eth_drv_probe(struct platform_device *pdev) priv->xmac_base = priv->xc->xmac_base; priv->sram_base = priv->xc->sram_base; + spin_lock_init(&priv->lock); + ret = pfifo_request(PFIFO_MASK(priv->id)); if (ret) { printk("unable to request PFIFO\n");