Thanks, applied.
On Mon, Jul 4, 2016 at 12:54 AM, joeyli <[email protected]> wrote: > On Mon, Jul 04, 2016 at 10:02:51AM +0530, Vikas C Sajjan wrote: >> If devm_add_action() fails, we are explicitly calling the cleanup to free >> the resources allocated. Lets use the helper devm_add_action_or_reset() >> and return directly in case of error, since the cleanup function >> has been already called by the helper if there was any error. >> >> Signed-off-by: Vikas C Sajjan <[email protected]> >> --- >> drivers/acpi/nfit.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c >> index c2ad967..44ebe1e 100644 >> --- a/drivers/acpi/nfit.c >> +++ b/drivers/acpi/nfit.c >> @@ -1920,11 +1920,11 @@ static int acpi_nfit_insert_resource(struct >> acpi_nfit_desc *acpi_desc, >> if (ret) >> return ret; >> >> - ret = devm_add_action(acpi_desc->dev, acpi_nfit_remove_resource, res); >> - if (ret) { >> - remove_resource(res); >> + ret = devm_add_action_or_reset(acpi_desc->dev, >> + acpi_nfit_remove_resource, >> + res); >> + if (ret) >> return ret; >> - } >> >> return 0; >> } >> -- >> 1.9.1 >> > > Reviewed-by: Lee, Chun-Yi <[email protected]> > > Joey Lee _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
