diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-04-27 07:06:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-27 07:06:52 -0700 |
| commit | 86dc30eade19cb791604812baaa2c76dbf6634d8 (patch) | |
| tree | 094da2c9172130d5b4ce545e63b09828ae356437 /drivers/char | |
| parent | 9d9b16e021b32fe2bb7144ae8d081e8c139d3a74 (diff) | |
| parent | b47135257c42a70a26247b05ff0ab42b6ad8fc8a (diff) | |
Merge "Merge branch 'android-4.4@c71ad0f' into branch 'msm-4.4'"
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 65f7eecc45b0..f10a107614b4 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -401,7 +401,7 @@ static void disable_interrupts(struct tpm_chip *chip) iowrite32(intmask, chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality)); - free_irq(chip->vendor.irq, chip); + devm_free_irq(chip->pdev, chip->vendor.irq, chip); chip->vendor.irq = 0; } |