2013-06-19 02:42:38

by Wei Yongjun

Subject: [PATCH] vme: vme_tsi148.c: fix error return code in tsi148_probe()

From: Wei Yongjun <[email protected]>

Fix to return a negative error code in the tsi148_crcsr_init() error
handling case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/vme/bridges/vme_tsi148.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
index 9c1aa4d..95c9b54 100644
--- a/drivers/vme/bridges/vme_tsi148.c
+++ b/drivers/vme/bridges/vme_tsi148.c
@@ -2582,7 +2582,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
dev_info(&pdev->dev, "VME Write and flush and error check is %s\n",
err_chk ? "enabled" : "disabled");

- if (tsi148_crcsr_init(tsi148_bridge, pdev)) {
+ retval = tsi148_crcsr_init(tsi148_bridge, pdev);
+ if (retval) {
dev_err(&pdev->dev, "CR/CSR configuration failed.\n");
goto err_crcsr;
}

2013-07-01 09:26:38

by Martyn Welch

Subject: Re: [PATCH] vme: vme_tsi148.c: fix error return code in tsi148_probe()

On 19/06/13 03:42, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> Fix to return a negative error code in the tsi148_crcsr_init() error
> handling case instead of 0, as done elsewhere in this function.
>

Hi Wei,

Thanks for your patch looks good.

Signed-off-by: Martyn Welch <[email protected]>

> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/vme/bridges/vme_tsi148.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
> index 9c1aa4d..95c9b54 100644
> --- a/drivers/vme/bridges/vme_tsi148.c
> +++ b/drivers/vme/bridges/vme_tsi148.c
> @@ -2582,7 +2582,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> dev_info(&pdev->dev, "VME Write and flush and error check is %s\n",
> err_chk ? "enabled" : "disabled");
>
> - if (tsi148_crcsr_init(tsi148_bridge, pdev)) {
> + retval = tsi148_crcsr_init(tsi148_bridge, pdev);
> + if (retval) {
> dev_err(&pdev->dev, "CR/CSR configuration failed.\n");
> goto err_crcsr;
> }
>


--
Martyn Welch (Lead Software Engineer) | Registered in England and Wales
GE Intelligent Platforms | (3828642) at 100 Barbirolli Square
T +44(0)1327322748 | Manchester, M2 3AB
E [email protected] | VAT:GB 927559189