* [PATCH -next] Staging: netlogic: fix missing free_netdev() on error in xlr_net_probe()
@ 2013-06-18 9:53 Wei Yongjun
2013-06-18 11:53 ` Tushar Behera
0 siblings, 1 reply; 3+ messages in thread
From: Wei Yongjun @ 2013-06-18 9:53 UTC (permalink / raw)
To: gregkh, ganesanr, tushar.behera; +Cc: yongjun_wei, devel, linux-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Fix missing free_netdev() before return from function xlr_net_probe()
in the devm_ioremap_resource() error handling case.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
no compile test.
---
drivers/staging/netlogic/xlr_net.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index b529d79..2acde54 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -1023,9 +1023,9 @@ static int xlr_net_probe(struct platform_device *pdev)
ndev->base_addr = (unsigned long) devm_ioremap_resource
(&pdev->dev, res);
if (IS_ERR_VALUE(ndev->base_addr)) {
- dev_err(&pdev->dev,
- "devm_ioremap_resource failed\n");
- return ndev->base_addr;
+ dev_err(&pdev->dev, "devm_ioremap_resource failed\n");
+ err = ndev->base_addr;
+ goto err_gmac;
}
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] Staging: netlogic: fix missing free_netdev() on error in xlr_net_probe()
2013-06-18 9:53 [PATCH -next] Staging: netlogic: fix missing free_netdev() on error in xlr_net_probe() Wei Yongjun
@ 2013-06-18 11:53 ` Tushar Behera
2013-06-19 2:29 ` [PATCH -next v2] " Wei Yongjun
0 siblings, 1 reply; 3+ messages in thread
From: Tushar Behera @ 2013-06-18 11:53 UTC (permalink / raw)
To: Wei Yongjun; +Cc: gregkh, ganesanr, yongjun_wei, devel, linux-kernel
On 06/18/2013 03:23 PM, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Fix missing free_netdev() before return from function xlr_net_probe()
> in the devm_ioremap_resource() error handling case.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> no compile test.
> ---
> drivers/staging/netlogic/xlr_net.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
> index b529d79..2acde54 100644
> --- a/drivers/staging/netlogic/xlr_net.c
> +++ b/drivers/staging/netlogic/xlr_net.c
> @@ -1023,9 +1023,9 @@ static int xlr_net_probe(struct platform_device *pdev)
> ndev->base_addr = (unsigned long) devm_ioremap_resource
> (&pdev->dev, res);
> if (IS_ERR_VALUE(ndev->base_addr)) {
> - dev_err(&pdev->dev,
> - "devm_ioremap_resource failed\n");
> - return ndev->base_addr;
> + dev_err(&pdev->dev, "devm_ioremap_resource failed\n");
Please remove this error message too. During review of my patchset, it
was pointed that this error message is redundant. There is already a
similar error message within devm_ioremap_resource call.
> + err = ndev->base_addr;
> + goto err_gmac;
> }
>
> res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
>
--
Tushar Behera
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH -next v2] Staging: netlogic: fix missing free_netdev() on error in xlr_net_probe()
2013-06-18 11:53 ` Tushar Behera
@ 2013-06-19 2:29 ` Wei Yongjun
0 siblings, 0 replies; 3+ messages in thread
From: Wei Yongjun @ 2013-06-19 2:29 UTC (permalink / raw)
To: tushar.behera; +Cc: gregkh, ganesanr, yongjun_wei, devel, linux-kernel
Fix missing free_netdev() before return from function xlr_net_probe()
in the devm_ioremap_resource() error handling case.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
v1 -> v2: remove redundant error message.
---
drivers/staging/netlogic/xlr_net.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index b529d79..af9e3f1 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -1023,9 +1023,8 @@ static int xlr_net_probe(struct platform_device *pdev)
ndev->base_addr = (unsigned long) devm_ioremap_resource
(&pdev->dev, res);
if (IS_ERR_VALUE(ndev->base_addr)) {
- dev_err(&pdev->dev,
- "devm_ioremap_resource failed\n");
- return ndev->base_addr;
+ err = ndev->base_addr;
+ goto err_gmac;
}
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-19 2:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-18 9:53 [PATCH -next] Staging: netlogic: fix missing free_netdev() on error in xlr_net_probe() Wei Yongjun
2013-06-18 11:53 ` Tushar Behera
2013-06-19 2:29 ` [PATCH -next v2] " Wei Yongjun
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).