| Message ID | 1415790527-6494-1-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jisheng, On Wed, Nov 12, 2014 at 07:08:47PM +0800, Jisheng Zhang wrote: > This is to ensure the net_device's dev.parent is set before we used it > in dma_zalloc_coherent() from init_hash_table(). Applies on top of net-next. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> FWIW, Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com> > --- > drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c > index 21ddece..38f7cee 100644 > --- a/drivers/net/ethernet/marvell/pxa168_eth.c > +++ b/drivers/net/ethernet/marvell/pxa168_eth.c > @@ -1540,8 +1540,8 @@ static int pxa168_eth_probe(struct platform_device *pdev) > if (err) > goto err_free_mdio; > > - pxa168_init_hw(pep); > SET_NETDEV_DEV(dev, &pdev->dev); > + pxa168_init_hw(pep); > err = register_netdev(dev); > if (err) > goto err_mdiobus; > -- > 2.1.3 >
From: Jisheng Zhang <jszhang@marvell.com> Date: Wed, 12 Nov 2014 19:08:47 +0800 > This is to ensure the net_device's dev.parent is set before we used it > in dma_zalloc_coherent() from init_hash_table(). > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Please always be explicit about what tree you generated this patch against and therefore expect it to be applied to by saying "[PATCH net-next]" or similar in your Subject line. Because this only applies cleanly to net-next, that's where I installed it. Thanks.
Dear David, On Wed, 12 Nov 2014 12:08:10 -0800 David Miller <davem@davemloft.net> wrote: > From: Jisheng Zhang <jszhang@marvell.com> > Date: Wed, 12 Nov 2014 19:08:47 +0800 > > > This is to ensure the net_device's dev.parent is set before we used it > > in dma_zalloc_coherent() from init_hash_table(). > > > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > > Please always be explicit about what tree you generated this patch against > and therefore expect it to be applied to by saying "[PATCH net-next]" or > similar in your Subject line. Got it. I will take care next time. Thanks a lot
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 21ddece..38f7cee 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -1540,8 +1540,8 @@ static int pxa168_eth_probe(struct platform_device *pdev) if (err) goto err_free_mdio; - pxa168_init_hw(pep); SET_NETDEV_DEV(dev, &pdev->dev); + pxa168_init_hw(pep); err = register_netdev(dev); if (err) goto err_mdiobus;
This is to ensure the net_device's dev.parent is set before we used it in dma_zalloc_coherent() from init_hash_table(). Signed-off-by: Jisheng Zhang <jszhang@marvell.com> --- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)