Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e0ee3c9 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm: fix the cleanup of struct tpm_chip 



If the initialization fails before tpm_chip_register(), put_device()
will be not called, which causes release callback not to be called.
This patch fixes the issue by adding put_device() to devres list of
the parent device.

Fixes: 313d21ee ("tpm: device class for tpm")
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
cc: stable@vger.kernel.org
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
parent 72c91ce8

drivers/char/tpm/tpm-chip.c

+3 −1
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, 
	chip->cdev.owner = chip->pdev->driver->owner;

	chip->cdev.kobj.parent = &chip->dev.kobj;



	devm_add_action(dev, (void (*)(void *)) put_device, &chip->dev);



	return chip;

}

EXPORT_SYMBOL_GPL(tpmm_chip_alloc);
@@ -171,7 +173,7 @@ static int tpm_add_char_device(struct tpm_chip *chip) 
static void tpm_del_char_device(struct tpm_chip *chip)

{

	cdev_del(&chip->cdev);

	device_unregister(&chip->dev);

	device_del(&chip->dev);

}



static int tpm1_chip_register(struct tpm_chip *chip)