* Re: [PATCH] EDAC, altera: Fix an error handling path in 'altr_edac_device_probe()'
2017-08-16 5:05 [PATCH] EDAC, altera: Fix an error handling path in 'altr_edac_device_probe()' Christophe JAILLET
@ 2017-08-17 15:30 ` Thor Thayer
2017-08-18 16:24 ` Borislav Petkov
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Thor Thayer @ 2017-08-17 15:30 UTC (permalink / raw)
To: Christophe JAILLET, bp, mchehab; +Cc: linux-edac, linux-kernel, kernel-janitors
On 08/16/2017 12:05 AM, Christophe JAILLET wrote:
> 'res' is known to be 0 at this point.
> If 'devm_ioremap()' fails, returns -ENOMEM instead of 0 which means
> success.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/edac/altera_edac.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
> index fa2e5db56d24..346c4987b284 100644
> --- a/drivers/edac/altera_edac.c
> +++ b/drivers/edac/altera_edac.c
> @@ -747,8 +747,10 @@ static int altr_edac_device_probe(struct platform_device *pdev)
> drvdata->edac_dev_name = ecc_name;
>
> drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
> - if (!drvdata->base)
> + if (!drvdata->base) {
> + res = -ENOMEM;
> goto fail1;
> + }
>
> /* Get driver specific data for this EDAC device */
> drvdata->data = of_match_node(altr_edac_device_of_match, np)->data;
>
Thank you for this patch!
Acked-by: Thor Thayer <thor.thayer@linux.intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] EDAC, altera: Fix an error handling path in 'altr_edac_device_probe()'
2017-08-16 5:05 [PATCH] EDAC, altera: Fix an error handling path in 'altr_edac_device_probe()' Christophe JAILLET
2017-08-17 15:30 ` Thor Thayer
@ 2017-08-18 16:24 ` Borislav Petkov
2018-06-10 15:34 ` [PATCH] EDAC, altera: Fix an error handling path in 'mv64x60_pci_err_probe()' Christophe JAILLET
2018-06-10 16:01 ` Christophe Jaillet
3 siblings, 0 replies; 5+ messages in thread
From: Borislav Petkov @ 2017-08-18 16:24 UTC (permalink / raw)
To: Thor Thayer, Christophe JAILLET
Cc: mchehab, linux-edac, linux-kernel, kernel-janitors
On Thu, Aug 17, 2017 at 10:30:23AM -0500, Thor Thayer wrote:
>
> On 08/16/2017 12:05 AM, Christophe JAILLET wrote:
> > 'res' is known to be 0 at this point.
> > If 'devm_ioremap()' fails, returns -ENOMEM instead of 0 which means
> > success.
> >
> > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> > ---
> > drivers/edac/altera_edac.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
> > index fa2e5db56d24..346c4987b284 100644
> > --- a/drivers/edac/altera_edac.c
> > +++ b/drivers/edac/altera_edac.c
> > @@ -747,8 +747,10 @@ static int altr_edac_device_probe(struct platform_device *pdev)
> > drvdata->edac_dev_name = ecc_name;
> > drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
> > - if (!drvdata->base)
> > + if (!drvdata->base) {
> > + res = -ENOMEM;
> > goto fail1;
> > + }
> > /* Get driver specific data for this EDAC device */
> > drvdata->data = of_match_node(altr_edac_device_of_match, np)->data;
> >
> Thank you for this patch!
>
> Acked-by: Thor Thayer <thor.thayer@linux.intel.com>
Applied, thanks.
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] EDAC, altera: Fix an error handling path in 'mv64x60_pci_err_probe()'
2017-08-16 5:05 [PATCH] EDAC, altera: Fix an error handling path in 'altr_edac_device_probe()' Christophe JAILLET
2017-08-17 15:30 ` Thor Thayer
2017-08-18 16:24 ` Borislav Petkov
@ 2018-06-10 15:34 ` Christophe JAILLET
2018-06-10 16:01 ` Christophe Jaillet
3 siblings, 0 replies; 5+ messages in thread
From: Christophe JAILLET @ 2018-06-10 15:34 UTC (permalink / raw)
To: thor.thayer, bp, mchehab
Cc: linux-edac, linux-kernel, kernel-janitors, Christophe JAILLET
IF 'regmap_write()' fails, we should release some resources as done in all
the other error handling paths of the function.
Fixes: e9918d7fafae ("EDAC, altera: Handle SDRAM Uncorrectable Errors on Stratix10")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/edac/altera_edac.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index d0d5c4dbe097..5762c3c383f2 100644
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -730,7 +730,8 @@ static int altr_s10_sdram_probe(struct platform_device *pdev)
S10_DDR0_IRQ_MASK)) {
edac_printk(KERN_ERR, EDAC_MC,
"Error clearing SDRAM ECC count\n");
- return -ENODEV;
+ ret = -ENODEV;
+ goto err2;
}
if (regmap_update_bits(drvdata->mc_vbase, priv->ecc_irq_en_offset,
--
2.17.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] EDAC, altera: Fix an error handling path in 'mv64x60_pci_err_probe()'
2017-08-16 5:05 [PATCH] EDAC, altera: Fix an error handling path in 'altr_edac_device_probe()' Christophe JAILLET
` (2 preceding siblings ...)
2018-06-10 15:34 ` [PATCH] EDAC, altera: Fix an error handling path in 'mv64x60_pci_err_probe()' Christophe JAILLET
@ 2018-06-10 16:01 ` Christophe Jaillet
3 siblings, 0 replies; 5+ messages in thread
From: Christophe Jaillet @ 2018-06-10 16:01 UTC (permalink / raw)
To: thor.thayer, bp, mchehab; +Cc: linux-edac, linux-kernel, kernel-janitors
Le 10/06/2018 à 17:34, Christophe JAILLET a écrit :
> IF 'regmap_write()' fails, we should release some resources as done in all
> the other error handling paths of the function.
>
> Fixes: e9918d7fafae ("EDAC, altera: Handle SDRAM Uncorrectable Errors on Stratix10")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/edac/altera_edac.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
> index d0d5c4dbe097..5762c3c383f2 100644
> --- a/drivers/edac/altera_edac.c
> +++ b/drivers/edac/altera_edac.c
> @@ -730,7 +730,8 @@ static int altr_s10_sdram_probe(struct platform_device *pdev)
> S10_DDR0_IRQ_MASK)) {
> edac_printk(KERN_ERR, EDAC_MC,
> "Error clearing SDRAM ECC count\n");
> - return -ENODEV;
> + ret = -ENODEV;
> + goto err2;
> }
>
> if (regmap_update_bits(drvdata->mc_vbase, priv->ecc_irq_en_offset,
>
Wrong subjet, will resend a v2 for that.
^ permalink raw reply [flat|nested] 5+ messages in thread