Commit 2b88cd96 authored Jun 12, 2016 by Sudip Mukherjee Committed by Jarkko Sakkinen Jul 19, 2016

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>

parent fa7539b2

drivers/char/tpm/tpm-chip.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);