diff options
| author | Dom Cobley <popcornmix@gmail.com> | 2024-04-05 14:30:14 +0100 |
|---|---|---|
| committer | Dom Cobley <popcornmix@gmail.com> | 2024-04-05 14:30:14 +0100 |
| commit | 05d6e664a1f3c59f82bbc2263d0103bf41c67e83 (patch) | |
| tree | dd7375d66d8e1b44c06cc4e0ce5dcdf54db70463 /drivers/char | |
| parent | 09db5a385c2c6056b1e577763621b54c3f9ad4dd (diff) | |
| parent | e475741af1ebe2c92ee4a3f49e55749a84770a12 (diff) | |
| download | linux-rpi-05d6e664a1f3c59f82bbc2263d0103bf41c67e83.tar.gz linux-rpi-05d6e664a1f3c59f82bbc2263d0103bf41c67e83.tar.bz2 linux-rpi-05d6e664a1f3c59f82bbc2263d0103bf41c67e83.zip | |
Merge remote-tracking branch 'stable/linux-6.6.y' into rpi-6.6.y
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm_tis_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index 1b350412d8a6..64c875657687 100644 --- 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); |