[PATCH] tpm: use devm_add_action_or_reset

[Sudip Mukherjee]

If devm_add_action() fails we are explicitly calling put_device() 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.mukher...@codethink.co.uk>
---
 drivers/char/tpm/tpm-chip.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 1965dc7..5a2f043 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -213,11 +213,11 @@ struct tpm_chip *tpmm_chip_alloc(struct device *pdev,
        if (IS_ERR(chip))
                return chip;
 
-       rc = devm_add_action(pdev, (void (*)(void *)) put_device, &chip->dev);
-       if (rc) {
-               put_device(&chip->dev);
+       rc = devm_add_action_or_reset(pdev,
+                                     (void (*)(void *)) put_device,
+                                     &chip->dev);
+       if (rc)
                return ERR_PTR(rc);
-       }
 
        dev_set_drvdata(pdev, chip);
 
-- 
1.9.1