---

yaml --- r: 313607 b: refs/heads/master c: 3072928 h: refs/heads/master i: 313605: 20e8783 313603: 30dd65d 313599: 33d50d7 v: v3
git-mirror · Jun 12, 2012 · c50d7d7 · c50d7d7
1 parent 2b3bbf3
commit c50d7d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dad79cb89254ce646906846b0f0cf7995d626710
+refs/heads/master: 3072928ff2457642af0da745b88f0420b4596c48
diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/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);