[PATCH] rocker: fix error return code in rocker_probe()

[PATCH] rocker: fix error return code in rocker_probe()

[weiyj_lk]

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

Fix to return -EINVAL from the invalid PCI region size error
handling case instead of 0, as done elsewhere in this function.

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

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 5cecec2..0cc17f5 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4293,6 +4293,7 @@ static int rocker_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	if (pci_resource_len(pdev, 0) < ROCKER_PCI_BAR0_SIZE) {
 		dev_err(&pdev->dev, "invalid PCI region size\n");
+		err = -EINVAL;
 		goto err_pci_resource_len_check;
 	}
 

Re: [PATCH] rocker: fix error return code in rocker_probe()

[Jiri Pirko]

Thu, Apr 16, 2015 at 02:21:02PM CEST, weiyj_lk@163.com wrote:
>From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
>Fix to return -EINVAL from the invalid PCI region size error
>handling case instead of 0, as done elsewhere in this function.
>
>Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>


Good catch.

Acked-by: Jiri Pirko <jiri@resnulli.us>

Re: [PATCH] rocker: fix error return code in rocker_probe()

[David Miller]

From: weiyj_lk@163.com
Date: Thu, 16 Apr 2015 20:21:02 +0800

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Fix to return -EINVAL from the invalid PCI region size error
> handling case instead of 0, as done elsewhere in this function.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Applied.