* [PATCH -next] skd: fix error return code in skd_pci_probe()
@ 2013-10-30 5:23 Wei Yongjun
2013-10-31 14:16 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-10-30 5:23 UTC (permalink / raw)
To: axboe, rchinthekindi, abhansali, jmoyer, ramprasad.chinthekindi
Cc: yongjun_wei, linux-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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 <yongjun_wei@trendmicro.com.cn>
---
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);
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH -next] skd: fix error return code in skd_pci_probe()
2013-10-30 5:23 [PATCH -next] skd: fix error return code in skd_pci_probe() Wei Yongjun
@ 2013-10-31 14:16 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2013-10-31 14:16 UTC (permalink / raw)
To: Wei Yongjun
Cc: rchinthekindi, abhansali, jmoyer, ramprasad.chinthekindi,
yongjun_wei, linux-kernel
On Wed, Oct 30 2013, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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 <yongjun_wei@trendmicro.com.cn>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-31 14:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-30 5:23 [PATCH -next] skd: fix error return code in skd_pci_probe() Wei Yongjun
2013-10-31 14:16 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.