Merge tag 'tpmdd-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko...

[linux-2.6-microblaze.git] / drivers / char / tpm / tpm_tis_core.c

diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 1b35041..64c8756 100644 (file)
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -919,8 +919,6 @@ static int tpm_tis_probe_irq_single(struct tpm_chip *chip, u32 intmask,
        int rc;
        u32 int_status;
 
-       INIT_WORK(&priv->free_irq_work, tpm_tis_free_irq_func);
-
        rc = devm_request_threaded_irq(chip->dev.parent, irq, NULL,
                                       tis_int_handler, IRQF_ONESHOT | flags,
                                       dev_name(&chip->dev), chip);
@@ -1132,6 +1130,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
        priv->phy_ops = phy_ops;
        priv->locality_count = 0;
        mutex_init(&priv->locality_count_mutex);
+       INIT_WORK(&priv->free_irq_work, tpm_tis_free_irq_func);
 
        dev_set_drvdata(&chip->dev, priv);