diff options
author | Martin Wilck <Martin.Wilck@ts.fujitsu.com> | 2015-11-05 17:19:09 +0100 |
---|---|---|
committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2015-11-09 16:52:54 +0100 |
commit | 2aef9da60bfdeb68dbcd4f114c098cbaa841b4ee (patch) | |
tree | c1d91077dccce06de7115dc262d7cb4353c3fc3d /drivers/char/tpm | |
parent | Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
download | linux-2aef9da60bfdeb68dbcd4f114c098cbaa841b4ee.tar.xz linux-2aef9da60bfdeb68dbcd4f114c098cbaa841b4ee.zip |
tpm_tis: free irq after probing
Release IRQs used for probing only. Otherwise the TPM will end up
with all IRQs 3-15 assigned.
Fixes: afb5abc262e9 ("tpm: two-phase chip management functions")
Signed-off-by: Martin Wilck <Martin.Wilck@ts.fujitsu.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Acked-by: Peter Huewe <PeterHuewe@gmx.de>
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r-- | drivers/char/tpm/tpm_tis.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 696ef1d56b4f..19f9c7dc7bc0 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -805,6 +805,8 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, iowrite32(intmask, chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality)); + + devm_free_irq(dev, i, chip); } } if (chip->vendor.irq) { |