summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStefan Berger <stefanb@linux.ibm.com>2019-08-29 20:09:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-05 15:12:17 +0200
commite4a8d7a6f95fbb19245f1443b4acb34020ea89b5 (patch)
tree12c3e9f59deb293f9007cffc8c883a623b9995b3 /drivers
parent7f064c378e2c8c848c7acc3ebba7ec45df1c5492 (diff)
downloadlinux-stable-e4a8d7a6f95fbb19245f1443b4acb34020ea89b5.tar.gz
linux-stable-e4a8d7a6f95fbb19245f1443b4acb34020ea89b5.tar.bz2
linux-stable-e4a8d7a6f95fbb19245f1443b4acb34020ea89b5.zip
tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts
commit 1ea32c83c699df32689d329b2415796b7bfc2f6e upstream. The tpm_tis_core has to set the TPM_CHIP_FLAG_IRQ before probing for interrupts since there is no other place in the code that would set it. Cc: linux-stable@vger.kernel.org Fixes: 570a36097f30 ("tpm: drop 'irq' from struct tpm_vendor_specific") Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tpm/tpm_tis_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index ffa9048d8f6c..270f43acbb77 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -981,6 +981,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
}
tpm_chip_start(chip);
+ chip->flags |= TPM_CHIP_FLAG_IRQ;
if (irq) {
tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
irq);