]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tpm_tis_core: convert max timeouts from msec to jiffies
authorapronin@chromium.org <apronin@chromium.org>
Fri, 15 Jul 2016 00:29:40 +0000 (17:29 -0700)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 19 Jul 2016 14:43:38 +0000 (17:43 +0300)
tpm_tis_core was missing conversion from msec when assigning max
timeouts from constants.

Fixes: aec04cbdf723 ("tpm: TPM 2.0 FIFO Interface")
Signed-off-by: Andrey Pronin <apronin@chromium.org>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
drivers/char/tpm/tpm_tis_core.c

index 03a06b33450a6f47e19ce3087780441f4d820e71..ace95b39566f25e575c51fb4c55e109781690e5a 100644 (file)
@@ -671,10 +671,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 #endif
 
        /* Maximum timeouts */
-       chip->timeout_a = TIS_TIMEOUT_A_MAX;
-       chip->timeout_b = TIS_TIMEOUT_B_MAX;
-       chip->timeout_c = TIS_TIMEOUT_C_MAX;
-       chip->timeout_d = TIS_TIMEOUT_D_MAX;
+       chip->timeout_a = msecs_to_jiffies(TIS_TIMEOUT_A_MAX);
+       chip->timeout_b = msecs_to_jiffies(TIS_TIMEOUT_B_MAX);
+       chip->timeout_c = msecs_to_jiffies(TIS_TIMEOUT_C_MAX);
+       chip->timeout_d = msecs_to_jiffies(TIS_TIMEOUT_D_MAX);
        priv->phy_ops = phy_ops;
        dev_set_drvdata(&chip->dev, priv);