Skip to content

Commit 786a2aa

Browse files
author
Jarkko Sakkinen
committed
Revert commit e918e57 ("tpm_tis: Remove the HID IFX0102")
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 <[email protected]> Reviewed-by: Jerry Snitselaar <[email protected]> Signed-off-by: Jarkko Sakkinen <[email protected]>
1 parent e918e57 commit 786a2aa

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/char/tpm/tpm_tis.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,17 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
235235
return tpm_tis_init(&pnp_dev->dev, &tpm_info);
236236
}
237237

238+
/*
239+
* There is a known bug caused by 93e1b7d42e1e ("[PATCH] tpm: add HID module
240+
* parameter"). This commit added IFX0102 device ID, which is also used by
241+
* tpm_infineon but ignored to add quirks to probe which driver ought to be
242+
* used.
243+
*/
244+
238245
static struct pnp_device_id tpm_pnp_tbl[] = {
239246
{"PNP0C31", 0}, /* TPM */
240247
{"ATM1200", 0}, /* Atmel */
248+
{"IFX0102", 0}, /* Infineon */
241249
{"BCM0101", 0}, /* Broadcom */
242250
{"BCM0102", 0}, /* Broadcom */
243251
{"NSC1200", 0}, /* National */

0 commit comments

Comments
 (0)