diff options
| author | Sajjan, Vikas C <vikas.cha.sajjan@hpe.com> | 2016-07-04 10:02:51 +0530 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-06 15:12:41 -0700 |
| commit | d932dd2ccda0d890d318428466794540e081b9c0 (patch) | |
| tree | 7fe31a8ec6b381d425ca4319fa29364bdc62c11c /drivers/acpi | |
| parent | 8729bdea829ebecfbc9601ba792e35f63331f63e (diff) | |
| download | op-kernel-dev-d932dd2ccda0d890d318428466794540e081b9c0.zip op-kernel-dev-d932dd2ccda0d890d318428466794540e081b9c0.tar.gz | |
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>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/nfit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index da14c89..3e54157 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; } |
