2013-10-30 05:23:55

by Wei Yongjun

Subject: [PATCH -next] skd: fix error return code in skd_pci_probe()

From: Wei Yongjun <[email protected]>

Fix to return -ENOMEM in the skd construct error handling
case instead of 0, as done elsewhere in this function.

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

diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index ab17bff..1a8717f 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -5321,8 +5321,10 @@ static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
}

skdev = skd_construct(pdev);
- if (skdev == NULL)
+ if (skdev == NULL) {
+ rc = -ENOMEM;
goto err_out_regions;
+ }

skd_pci_info(skdev, pci_str);
pr_info("(%s): %s 64bit\n", skd_name(skdev), pci_str);

2013-10-31 14:16:32

by Jens Axboe

Subject: Re: [PATCH -next] skd: fix error return code in skd_pci_probe()

On Wed, Oct 30 2013, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> Fix to return -ENOMEM in the skd construct error handling
> case instead of 0, as done elsewhere in this function.
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/block/skd_main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
> index ab17bff..1a8717f 100644
> --- a/drivers/block/skd_main.c
> +++ b/drivers/block/skd_main.c
> @@ -5321,8 +5321,10 @@ static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> }
>
> skdev = skd_construct(pdev);
> - if (skdev == NULL)
> + if (skdev == NULL) {
> + rc = -ENOMEM;
> goto err_out_regions;
> + }
>
> skd_pci_info(skdev, pci_str);
> pr_info("(%s): %s 64bit\n", skd_name(skdev), pci_str);

Applied, thanks.

--
Jens Axboe