From c50d7d726a18e3cfcf733e1c7b3181daae96d67a Mon Sep 17 00:00:00 2001 From: Andi Shyti Date: Mon, 28 May 2012 18:42:45 +0200 Subject: [PATCH] --- yaml --- r: 313607 b: refs/heads/master c: 3072928ff2457642af0da745b88f0420b4596c48 h: refs/heads/master i: 313605: 20e87831547f5bac4bf4fd4462e72a607f8878d7 313603: 30dd65d15544eeabd428bf7624eda80eeea84cc7 313599: 33d50d78adaab6149de11463acdbc9c83d61eddb v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 65d4de611ee3..4003a9225329 100644 --- 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 index dae254d53723..d39b1f60ba23 100644 --- 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);