netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] net: sun4i-emac: fix a typo in emac_probe()
@ 2013-06-03 13:36 Wei Yongjun
  2013-06-03 16:20 ` Joe Perches
  2013-06-04 13:24 ` Maxime Ripard
  0 siblings, 2 replies; 4+ messages in thread
From: Wei Yongjun @ 2013-06-03 13:36 UTC (permalink / raw)
  To: grant.likely, rob.herring, maxime.ripard, davem, sr
  Cc: yongjun_wei, netdev, devicetree-discuss

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Just fixed a typo in emac_probe().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index b411344..26083cd 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -821,7 +821,7 @@ static int emac_probe(struct platform_device *pdev)
 	db->membase = of_iomap(np, 0);
 	if (!db->membase) {
 		dev_err(&pdev->dev, "failed to remap registers\n");
-		return -ENOMEM;
+		ret = -ENOMEM;
 		goto out;
 	}
 

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH -next] net: sun4i-emac: fix a typo in emac_probe()
  2013-06-03 13:36 [PATCH -next] net: sun4i-emac: fix a typo in emac_probe() Wei Yongjun
@ 2013-06-03 16:20 ` Joe Perches
  2013-06-04 13:24 ` Maxime Ripard
  1 sibling, 0 replies; 4+ messages in thread
From: Joe Perches @ 2013-06-03 16:20 UTC (permalink / raw)
  To: Wei Yongjun
  Cc: grant.likely, rob.herring, maxime.ripard, davem, sr, yongjun_wei,
	netdev, devicetree-discuss

On Mon, 2013-06-03 at 21:36 +0800, Wei Yongjun wrote:
> Just fixed a typo in emac_probe().

also fixed a memory leak.

> diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
[]
> @@ -821,7 +821,7 @@ static int emac_probe(struct platform_device *pdev)
>  	db->membase = of_iomap(np, 0);
>  	if (!db->membase) {
>  		dev_err(&pdev->dev, "failed to remap registers\n");
> -		return -ENOMEM;
> +		ret = -ENOMEM;
>  		goto out;
>  	}

out:
	dev_err(db->dev, "not found (%d).\n", ret);

	free_netdev(ndev);

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH -next] net: sun4i-emac: fix a typo in emac_probe()
  2013-06-03 13:36 [PATCH -next] net: sun4i-emac: fix a typo in emac_probe() Wei Yongjun
  2013-06-03 16:20 ` Joe Perches
@ 2013-06-04 13:24 ` Maxime Ripard
  2013-06-05  0:20   ` David Miller
  1 sibling, 1 reply; 4+ messages in thread
From: Maxime Ripard @ 2013-06-04 13:24 UTC (permalink / raw)
  To: Wei Yongjun
  Cc: grant.likely, rob.herring, davem, sr, yongjun_wei, netdev,
	devicetree-discuss

Hi,

On Mon, Jun 03, 2013 at 09:36:52PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Just fixed a typo in emac_probe().
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
>  drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
> index b411344..26083cd 100644
> --- a/drivers/net/ethernet/allwinner/sun4i-emac.c
> +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
> @@ -821,7 +821,7 @@ static int emac_probe(struct platform_device *pdev)
>  	db->membase = of_iomap(np, 0);
>  	if (!db->membase) {
>  		dev_err(&pdev->dev, "failed to remap registers\n");
> -		return -ENOMEM;
> +		ret = -ENOMEM;
>  		goto out;
>  	}
>  
> 

Ouch, nice catch.
Thanks!

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH -next] net: sun4i-emac: fix a typo in emac_probe()
  2013-06-04 13:24 ` Maxime Ripard
@ 2013-06-05  0:20   ` David Miller
  0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-06-05  0:20 UTC (permalink / raw)
  To: maxime.ripard
  Cc: weiyj.lk, grant.likely, rob.herring, sr, yongjun_wei, netdev,
	devicetree-discuss

From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 4 Jun 2013 15:24:08 +0200

> On Mon, Jun 03, 2013 at 09:36:52PM +0800, Wei Yongjun wrote:
>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> 
>> Just fixed a typo in emac_probe().
>> 
>> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
 ...
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Applied.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-06-05  0:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-03 13:36 [PATCH -next] net: sun4i-emac: fix a typo in emac_probe() Wei Yongjun
2013-06-03 16:20 ` Joe Perches
2013-06-04 13:24 ` Maxime Ripard
2013-06-05  0:20   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).