[PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()'

From	Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Newsgroups	linux.kernel
Subject	[PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()'
Date	2017-08-16 07:40 +0200
Message-ID	<ueZdD-30Q-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

'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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] sata: ahci-da850: Fix some error handling paths in 'ahci_da850_probe()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-08-16 07:40 +0200
  Re: [PATCH] sata: ahci-da850: Fix some error handling paths in  'ahci_da850_probe()' Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-08-16 11:10 +0200
  Re: [PATCH] sata: ahci-da850: Fix some error handling paths in  'ahci_da850_probe()' Tejun Heo <tj@kernel.org> - 2017-08-16 16:50 +0200

csiph-web