| Message ID | 20170816053103.19773-1-christophe.jaillet@wanadoo.fr |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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.
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);
'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(-)