| Message ID | 1360510721-17860-2-git-send-email-ben.dooks@codethink.co.uk |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 02/10/2013 09:38 AM, Ben Dooks wrote: > The current driver attempts to print netdev_info() before registering the > network device and allowing the name to be set. Change this print to be > after the network deviec has been registered, and thus has been allocated You missed the typo pointed out on the first version sent to lakml. > a network device name. > > Fix the following issue: > > calxedaxgmac fff50000.ethernet (unregistered net_device): h/w version is 0x1012 > > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Otherwise, Acked-by: Rob Herring <rob.herring@calxeda.com> > --- > drivers/net/ethernet/calxeda/xgmac.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c > index f7f0290..f91d9b2 100644 > --- a/drivers/net/ethernet/calxeda/xgmac.c > +++ b/drivers/net/ethernet/calxeda/xgmac.c > @@ -1715,9 +1715,6 @@ static int xgmac_probe(struct platform_device *pdev) > goto err_io; > } > > - uid = readl(priv->base + XGMAC_VERSION); > - netdev_info(ndev, "h/w version is 0x%x\n", uid); > - > writel(0, priv->base + XGMAC_DMA_INTR_ENA); > ndev->irq = platform_get_irq(pdev, 0); > if (ndev->irq == -ENXIO) { > @@ -1771,6 +1768,9 @@ static int xgmac_probe(struct platform_device *pdev) > if (ret) > goto err_reg; > > + uid = readl(priv->base + XGMAC_VERSION); > + netdev_info(ndev, "h/w version is 0x%x\n", uid); > + > return 0; > > err_reg: > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/02/13 22:34, Rob Herring wrote: > On 02/10/2013 09:38 AM, Ben Dooks wrote: >> The current driver attempts to print netdev_info() before registering the >> network device and allowing the name to be set. Change this print to be >> after the network deviec has been registered, and thus has been allocated > > You missed the typo pointed out on the first version sent to lakml. Oops, sorry. >> a network device name. >> >> Fix the following issue: >> >> calxedaxgmac fff50000.ethernet (unregistered net_device): h/w version is 0x1012 >> >> Signed-off-by: Ben Dooks<ben.dooks@codethink.co.uk> > > Otherwise, > > Acked-by: Rob Herring<rob.herring@calxeda.com> Thanks.
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index f7f0290..f91d9b2 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -1715,9 +1715,6 @@ static int xgmac_probe(struct platform_device *pdev) goto err_io; } - uid = readl(priv->base + XGMAC_VERSION); - netdev_info(ndev, "h/w version is 0x%x\n", uid); - writel(0, priv->base + XGMAC_DMA_INTR_ENA); ndev->irq = platform_get_irq(pdev, 0); if (ndev->irq == -ENXIO) { @@ -1771,6 +1768,9 @@ static int xgmac_probe(struct platform_device *pdev) if (ret) goto err_reg; + uid = readl(priv->base + XGMAC_VERSION); + netdev_info(ndev, "h/w version is 0x%x\n", uid); + return 0; err_reg:
The current driver attempts to print netdev_info() before registering the network device and allowing the name to be set. Change this print to be after the network deviec has been registered, and thus has been allocated a network device name. Fix the following issue: calxedaxgmac fff50000.ethernet (unregistered net_device): h/w version is 0x1012 Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- drivers/net/ethernet/calxeda/xgmac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)