Commit d932dd2c authored Jul 04, 2016 by Sajjan, Vikas C Committed by Dan Williams Jul 06, 2016

nfit: use devm_add_action_or_reset()



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 <vikas.cha.sajjan@hpe.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

parent 8729bdea

drivers/acpi/nfit.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message