From d1c8e0c521c111f387a17096a17e49af5dea4aa9 Mon Sep 17 00:00:00 2001 From: "Sajjan, Vikas C" Date: Tue, 5 Jul 2016 11:20:07 +0530 Subject: dax: use devm_add_action_or_reset() If devm_add_action() fails, we are explicitly calling the cleanup to free the resources allocated. 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. Reported-by: Sudip Mukherjee Signed-off-by: Vikas C Sajjan Reviewed-by: Johannes Thumshirn Signed-off-by: Dan Williams --- drivers/dax/dax.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/dax/dax.c') diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c index b891a129b275..803f3953b341 100644 --- a/drivers/dax/dax.c +++ b/drivers/dax/dax.c @@ -211,11 +211,9 @@ int devm_create_dax_dev(struct dax_region *dax_region, struct resource *res, } dax_dev->dev = dev; - rc = devm_add_action(dax_region->dev, unregister_dax_dev, dev); - if (rc) { - unregister_dax_dev(dev); + rc = devm_add_action_or_reset(dax_region->dev, unregister_dax_dev, dev); + if (rc) return rc; - } return 0; -- cgit v1.2.3-59-g8ed1b