1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index dae254d53723..d39b1f60ba23 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -1330,6 +1330,9 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume);
 
 void tpm_dev_vendor_release(struct tpm_chip *chip)
 {
+        if (!chip)
+                return;
+
         if (chip->vendor.release)
                 chip->vendor.release(chip->dev);
 
@@ -1347,6 +1350,9 @@ void tpm_dev_release(struct device *dev)
 {
         struct tpm_chip *chip = dev_get_drvdata(dev);
 
+        if (!chip)
+                return;
+
         tpm_dev_vendor_release(chip);
 
         chip->release(dev);