From: Stefan Berger stefanb@linux.ibm.com
Revert the patch that was turning the TPM on before probing for IRQs.
Fixes: 5b359c7c4372 ("tpm_tis_core: Turn on the TPM before probing IRQ's") Signed-off-by: Stefan Berger stefanb@linux.ibm.com Reported-by: Jerry Snitselaar jsnitsel@redhat.com Cc: stable@vger.kernel.org --- drivers/char/tpm/tpm_tis_core.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 5dc52c4e2292..27c6ca031e23 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -1059,7 +1059,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, goto out_err; }
- tpm_chip_start(chip); if (irq) { tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, irq); @@ -1069,7 +1068,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, } else { tpm_tis_probe_irq(chip, intmask); } - tpm_chip_stop(chip); }
rc = tpm_chip_register(chip);