Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1420276

[PATCH] Input: axp20x-pek: use devm_add_action_or_reset

Show all headers | View raw

If devm_add_action() fails we are explicitly calling
axp20x_remove_sysfs_group() to free the resources allocated. Lets use
the helper devm_add_action_or_reset() and return directly in case of
error, as we know that the cleanup function has been already called by
the helper if there was any error.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
---
 drivers/input/misc/axp20x-pek.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c
index 1ac898d..419ca97 100644
--- a/drivers/input/misc/axp20x-pek.c
+++ b/drivers/input/misc/axp20x-pek.c
@@ -260,10 +260,10 @@ static int axp20x_pek_probe(struct platform_device *pdev)
 		return error;
 	}
 
-	error = devm_add_action(&pdev->dev,
-				axp20x_remove_sysfs_group, &pdev->dev);
+	error = devm_add_action_or_reset(&pdev->dev,
+					 axp20x_remove_sysfs_group,
+					 &pdev->dev);
 	if (error) {
-		axp20x_remove_sysfs_group(&pdev->dev);
 		dev_err(&pdev->dev, "Failed to add sysfs cleanup action: %d\n",
 			error);
 		return error;
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Input: axp20x-pek: use devm_add_action_or_reset Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-06-12 16:20 +0200
  Re: [PATCH] Input: axp20x-pek: use devm_add_action_or_reset Chen-Yu Tsai <wens@csie.org> - 2016-06-13 06:00 +0200

csiph-web