Skip to content

Commit

Permalink
Revert commit e918e57 ("tpm_tis: Remove the HID IFX0102")
Browse files Browse the repository at this point in the history
Removing IFX0102 from tpm_tis was not a right move because both tpm_tis
and tpm_infineon use the same device ID. Revert the commit and add a
remark about a bug caused by commit 93e1b7d ("[PATCH] tpm: add HID
module parameter").

Fixes: e918e57 ("tpm_tis: Remove the HID IFX0102")
Reported-by: Peter Huewe <peterhuewe@gmx.de>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  • Loading branch information
Jarkko Sakkinen committed Jul 7, 2020
1 parent e918e57 commit 786a2aa
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/char/tpm/tpm_tis.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,17 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
return tpm_tis_init(&pnp_dev->dev, &tpm_info);
}

/*
* There is a known bug caused by 93e1b7d42e1e ("[PATCH] tpm: add HID module
* parameter"). This commit added IFX0102 device ID, which is also used by
* tpm_infineon but ignored to add quirks to probe which driver ought to be
* used.
*/

static struct pnp_device_id tpm_pnp_tbl[] = {
{"PNP0C31", 0}, /* TPM */
{"ATM1200", 0}, /* Atmel */
{"IFX0102", 0}, /* Infineon */
{"BCM0101", 0}, /* Broadcom */
{"BCM0102", 0}, /* Broadcom */
{"NSC1200", 0}, /* National */
Expand Down

0 comments on commit 786a2aa

Please sign in to comment.