Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm: fix the cleanup of struct tpm_chip

Browse Source 
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: 313d21eeab ("tpm: device class for tpm")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
cc: stable@vger.kernel.org
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
This commit is contained in:
Jarkko Sakkinen 2016-02-08 22:31:08 +02:00
parent 72c91ce852
commit 8e0ee3c9fa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/tpm/tpm-chip.c
View File

@ -136,6 +136,8 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,
chip->cdev.owner = chip->pdev->driver->owner; chip->cdev.owner = chip->pdev->driver->owner;
chip->cdev.kobj.parent = &chip->dev.kobj; chip->cdev.kobj.parent = &chip->dev.kobj;
devm_add_action(dev, (void (*)(void *)) put_device, &chip->dev);
return chip; return chip;
} }
EXPORT_SYMBOL_GPL(tpmm_chip_alloc); 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) static void tpm_del_char_device(struct tpm_chip *chip)
{ {
cdev_del(&chip->cdev); cdev_del(&chip->cdev);
device_unregister(&chip->dev); device_del(&chip->dev);
} }
static int tpm1_chip_register(struct tpm_chip *chip) static int tpm1_chip_register(struct tpm_chip *chip)