aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Wilck <Martin.Wilck@ts.fujitsu.com>2015-11-05 11:19:09 -0500
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2015-11-09 10:52:54 -0500
commit2aef9da60bfdeb68dbcd4f114c098cbaa841b4ee (patch)
treec1d91077dccce06de7115dc262d7cb4353c3fc3d
parentba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 (diff)
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>
-rw-r--r--drivers/char/tpm/tpm_tis.c2
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,
805 iowrite32(intmask, 805 iowrite32(intmask,
806 chip->vendor.iobase + 806 chip->vendor.iobase +
807 TPM_INT_ENABLE(chip->vendor.locality)); 807 TPM_INT_ENABLE(chip->vendor.locality));
808
809 devm_free_irq(dev, i, chip);
808 } 810 }
809 } 811 }
810 if (chip->vendor.irq) { 812 if (chip->vendor.irq) {