Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ede1d58c authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by Greg Kroah-Hartman
Browse files

tpm/tpm_tis: Free IRQ if probing fails 



commit b160c94be5d2816b62c8ac338605668304242959 upstream.

Call disable_interrupts() if we have to revert to polling in order not to
unnecessarily reserve the IRQ for the life-cycle of the driver.

Cc: stable@vger.kernel.org # 4.5.x
Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Fixes: e3837e74 ("tpm_tis: Refactor the interrupt setup")
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 65e3bab6

drivers/char/tpm/tpm_tis_core.c

+7 −1
Original line number Diff line number Diff line
@@ -437,6 +437,9 @@ static void disable_interrupts(struct tpm_chip *chip) 
	u32 intmask;

	int rc;



	if (priv->irq == 0)

		return;



	rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask);

	if (rc < 0)

		intmask = 0;
@@ -984,9 +987,12 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, 
		if (irq) {

			tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,

						 irq);

			if (!(chip->flags & TPM_CHIP_FLAG_IRQ))

			if (!(chip->flags & TPM_CHIP_FLAG_IRQ)) {

				dev_err(&chip->dev, FW_BUG

					"TPM interrupt not working, polling instead\n");



				disable_interrupts(chip);

			}

		} else {

			tpm_tis_probe_irq(chip, intmask);

		}