From: Jason Gunthorpe jgunthorpe@obsidianresearch.com
This patch has been added to the stable tree. If you have any objections, please let us know.
===============
[ Upstream commit 727f28b8ca24a581c7bd868326b8cea1058c720a ]
The interrupt is always allocated with devm_request_irq so it must always be freed with devm_free_irq.
Fixes: 448e9c55c12d ("tpm_tis: verify interrupt during init") Signed-off-by: Jason Gunthorpe jgunthorpe@obsidianresearch.com Acked-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Tested-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Tested-by: Martin Wilck Martin.Wilck@ts.fujitsu.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Acked-by: Peter Huewe peterhuewe@gmx.de Signed-off-by: Sasha Levin alexander.levin@microsoft.com --- drivers/char/tpm/tpm_tis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 696ef1d56b4f..5809567d3cf0 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -401,7 +401,7 @@ static void disable_interrupts(struct tpm_chip *chip) iowrite32(intmask, chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality)); - free_irq(chip->vendor.irq, chip); + devm_free_irq(chip->pdev, chip->vendor.irq, chip); chip->vendor.irq = 0; }