[Eoan 1/2] Revert "tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts"

Thadeu Lima de Souza Cascardo cascardo at canonical.com
Thu Nov 28 13:54:21 UTC 2019


BugLink: https://bugs.launchpad.net/bugs/1852586

This reverts commit dd0bf321c5ea7ef5755e7e68d5e5b61010ad2ef9.

This and the following revert fix a boot problem reported by different
users. At least, one user has reported that the reverts fix the boot
issue.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 drivers/char/tpm/tpm_tis_core.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 270f43acbb77..ffa9048d8f6c 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -981,7 +981,6 @@ 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);
-- 
2.20.1




More information about the kernel-team mailing list