diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2016-06-12 15:05:29 +0100 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-07-19 17:43:38 +0300 |
| commit | 2b88cd96eb85d2f07873e6050e531df45d8a0cc8 (patch) | |
| tree | 4fd62c598a6f2e8adf8b5de67c8d57c4a3482337 /drivers/char/tpm/tpm-chip.c | |
| parent | fa7539b27f4a9d0bfaede2f7547c2322ac68f1f2 (diff) | |
| download | linux-2b88cd96eb85d2f07873e6050e531df45d8a0cc8.tar.gz linux-2b88cd96eb85d2f07873e6050e531df45d8a0cc8.tar.bz2 linux-2b88cd96eb85d2f07873e6050e531df45d8a0cc8.zip | |
tpm: use devm_add_action_or_reset
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.mukherjee@codethink.co.uk>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char/tpm/tpm-chip.c')
| -rw-r--r-- | drivers/char/tpm/tpm-chip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 1965dc780688..5a2f0439ef47 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); |