| Message ID | 20200208140920.7652-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 88654d5b4476a438bd86b257dc4d70bb32266f1b |
| Headers | show |
| Series | [1/2] powerpc/83xx: Fix some typo in some warning message | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (a5bc6e124219546a81ce334dc9b16483d55e9abf) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 20 lines checked |
| snowpatch_ozlabs/needsstable | warning | Please consider tagging this patch for stable! |
On Sat, 2020-02-08 at 15:09 +0100, Christophe JAILLET wrote: > In some error handling path, we should call "of_node_put(np_par)" or > some resource may be leaking in case of error. > > Fixes: 8159df72d43e ("83xx: add support for the kmeter1 board.") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > arch/powerpc/platforms/83xx/km83xx.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > Both patches: Acked-by: Scott Wood <oss@buserror.net> > diff --git a/arch/powerpc/platforms/83xx/km83xx.c > b/arch/powerpc/platforms/83xx/km83xx.c > index 306be75faec7..bcdc2c203ec9 100644 > --- a/arch/powerpc/platforms/83xx/km83xx.c > +++ b/arch/powerpc/platforms/83xx/km83xx.c > @@ -60,10 +60,12 @@ static void quirk_mpc8360e_qe_enet10(void) > ret = of_address_to_resource(np_par, 0, &res); > if (ret) { > pr_warn("%s couldn't map par_io registers\n", __func__); > - return; > + goto out; > } > > base = ioremap(res.start, resource_size(&res)); > + if (!base) > + goto out; > > /* > * set output delay adjustments to default values according > @@ -111,6 +113,7 @@ static void quirk_mpc8360e_qe_enet10(void) > setbits32((base + 0xac), 0x0000c000); > } > iounmap(base); > +out: > of_node_put(np_par); > } >
diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c index 306be75faec7..bcdc2c203ec9 100644 --- a/arch/powerpc/platforms/83xx/km83xx.c +++ b/arch/powerpc/platforms/83xx/km83xx.c @@ -60,10 +60,12 @@ static void quirk_mpc8360e_qe_enet10(void) ret = of_address_to_resource(np_par, 0, &res); if (ret) { pr_warn("%s couldn't map par_io registers\n", __func__); - return; + goto out; } base = ioremap(res.start, resource_size(&res)); + if (!base) + goto out; /* * set output delay adjustments to default values according @@ -111,6 +113,7 @@ static void quirk_mpc8360e_qe_enet10(void) setbits32((base + 0xac), 0x0000c000); } iounmap(base); +out: of_node_put(np_par); }
In some error handling path, we should call "of_node_put(np_par)" or some resource may be leaking in case of error. Fixes: 8159df72d43e ("83xx: add support for the kmeter1 board.") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- arch/powerpc/platforms/83xx/km83xx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)