From 400536b76b6ae3fc71ca0814177e6db0e5a629a4 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Wed, 29 Feb 2012 10:29:23 +0100 Subject: [PATCH] --- yaml --- r: 291767 b: refs/heads/master c: 4e70daaf05a181b6968e29e72e9f1c16a183e92c h: refs/heads/master i: 291765: fe2281b0bbc14a6c6c360fca3394c3fb87daea23 291763: db677bc4d573f13a64e841e1ba9132a8a98d4d5f 291759: 66f35e2b2bf4c773c51fb813ddf4be49ed2b963e v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_tis.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index aaeae6d09f25..d25f8d72a1c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3363c912ba743e6f981ba58c744e413fc41f943 +refs/heads/master: 4e70daaf05a181b6968e29e72e9f1c16a183e92c diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c index a1748621111b..70fac9abb0e2 100644 --- a/trunk/drivers/char/tpm/tpm_tis.c +++ b/trunk/drivers/char/tpm/tpm_tis.c @@ -76,7 +76,7 @@ enum tis_defaults { #define TPM_RID(l) (0x0F04 | ((l) << 12)) static LIST_HEAD(tis_chips); -static DEFINE_SPINLOCK(tis_lock); +static DEFINE_MUTEX(tis_lock); #if defined(CONFIG_PNP) && defined(CONFIG_ACPI) static int is_itpm(struct pnp_dev *dev) @@ -689,9 +689,9 @@ static int tpm_tis_init(struct device *dev, resource_size_t start, } INIT_LIST_HEAD(&chip->vendor.list); - spin_lock(&tis_lock); + mutex_lock(&tis_lock); list_add(&chip->vendor.list, &tis_chips); - spin_unlock(&tis_lock); + mutex_unlock(&tis_lock); return 0; @@ -855,7 +855,7 @@ static void __exit cleanup_tis(void) { struct tpm_vendor_specific *i, *j; struct tpm_chip *chip; - spin_lock(&tis_lock); + mutex_lock(&tis_lock); list_for_each_entry_safe(i, j, &tis_chips, list) { chip = to_tpm_chip(i); tpm_remove_hardware(chip->dev); @@ -871,7 +871,7 @@ static void __exit cleanup_tis(void) iounmap(i->iobase); list_del(&i->list); } - spin_unlock(&tis_lock); + mutex_unlock(&tis_lock); #ifdef CONFIG_PNP if (!force) { pnp_unregister_driver(&tis_pnp_driver);