* [PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()'
@ 2017-08-16 5:31 Christophe JAILLET
2017-08-16 9:04 ` Sergei Shtylyov
2017-08-16 14:40 ` Tejun Heo
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2017-08-16 5:31 UTC (permalink / raw)
To: tj; +Cc: linux-ide, linux-kernel, kernel-janitors, Christophe JAILLET
'rc' is known to be 0 at this point.
If 'platform_get_resource()' or 'devm_ioremap()' fail, return -ENOMEM
instead of 0 which means success.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/ata/ahci_da850.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c
index 1a50cd3b4233..eb46cad4d514 100644
--- a/drivers/ata/ahci_da850.c
+++ b/drivers/ata/ahci_da850.c
@@ -216,12 +216,16 @@ static int ahci_da850_probe(struct platform_device *pdev)
return rc;
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- if (!res)
+ if (!res) {
+ rc = -ENOMEM;
goto disable_resources;
+ }
pwrdn_reg = devm_ioremap(dev, res->start, resource_size(res));
- if (!pwrdn_reg)
+ if (!pwrdn_reg) {
+ rc = -ENOMEM;
goto disable_resources;
+ }
da850_sata_init(dev, pwrdn_reg, hpriv->mmio, mpy);
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()'
2017-08-16 5:31 [PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()' Christophe JAILLET
@ 2017-08-16 9:04 ` Sergei Shtylyov
2017-08-16 14:40 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2017-08-16 9:04 UTC (permalink / raw)
To: Christophe JAILLET, tj; +Cc: linux-ide, linux-kernel, kernel-janitors
Hello!
On 8/16/2017 8:31 AM, Christophe JAILLET wrote:
> 'rc' is known to be 0 at this point.
> If 'platform_get_resource()' or 'devm_ioremap()' fail, return -ENOMEM
> instead of 0 which means success.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/ata/ahci_da850.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c
> index 1a50cd3b4233..eb46cad4d514 100644
> --- a/drivers/ata/ahci_da850.c
> +++ b/drivers/ata/ahci_da850.c
> @@ -216,12 +216,16 @@ static int ahci_da850_probe(struct platform_device *pdev)
> return rc;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> - if (!res)
> + if (!res) {
> + rc = -ENOMEM;
-ENODEV would fit better here.
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()'
2017-08-16 5:31 [PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()' Christophe JAILLET
2017-08-16 9:04 ` Sergei Shtylyov
@ 2017-08-16 14:40 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Tejun Heo @ 2017-08-16 14:40 UTC (permalink / raw)
To: Christophe JAILLET
Cc: linux-ide, linux-kernel, kernel-janitors, Sergei Shtylyov
Hello,
On Wed, Aug 16, 2017 at 07:31:03AM +0200, Christophe JAILLET wrote:
> 'rc' is known to be 0 at this point.
> If 'platform_get_resource()' or 'devm_ioremap()' fail, return -ENOMEM
> instead of 0 which means success.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied to libata/for-4.13-fixes w/ Sergei's suggestion applied.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-16 14:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-16 5:31 [PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()' Christophe JAILLET
2017-08-16 9:04 ` Sergei Shtylyov
2017-08-16 14:40 ` Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox