diff options
author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2015-11-25 16:05:30 -0500 |
---|---|---|
committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2015-12-20 08:23:45 -0500 |
commit | 727f28b8ca24a581c7bd868326b8cea1058c720a (patch) | |
tree | 3124d6e426b1e11ba722023d8e1f3a3f2a5e79be /drivers/char | |
parent | f728643001397cee39dcfabff6458a5fbc3baecf (diff) |
tpm_tis: Use devm_free_irq not free_irq
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>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/tpm/tpm_tis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 65f7eecc45b0..f10a107614b4 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) | |||
401 | iowrite32(intmask, | 401 | iowrite32(intmask, |
402 | chip->vendor.iobase + | 402 | chip->vendor.iobase + |
403 | TPM_INT_ENABLE(chip->vendor.locality)); | 403 | TPM_INT_ENABLE(chip->vendor.locality)); |
404 | free_irq(chip->vendor.irq, chip); | 404 | devm_free_irq(chip->pdev, chip->vendor.irq, chip); |
405 | chip->vendor.irq = 0; | 405 | chip->vendor.irq = 0; |
406 | } | 406 | } |
407 | 407 | ||