* [PATCH 12 of 12] Fix Tpm driver -- locks
@ 2005-04-27 22:19 Kylene Hall
0 siblings, 0 replies; 2+ messages in thread
From: Kylene Hall @ 2005-04-27 22:19 UTC (permalink / raw)
To: linux-kernel
A lock in the register hardware is missing and the one in release is
misplaced. This patch fixes these issues.
Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
---
--- linux-2.6.12-rc2/drivers/char/tpm/tpm.c 2005-04-27 14:19:17.000000000 -0500
+++ linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm.c 2005-04-27 14:25:04.000000000 -0500
@@ -445,15 +445,15 @@ EXPORT_SYMBOL_GPL(tpm_open);
int tpm_release(struct inode *inode, struct file *file)
{
struct tpm_chip *chip = file->private_data;
-
- file->private_data = NULL;
spin_lock(&driver_lock);
+ file->private_data = NULL;
chip->num_opens--;
del_singleshot_timer_sync(&chip->user_read_timer);
atomic_set(&chip->data_pending, 0);
-
pci_dev_put(chip->pci_dev);
+ kfree(chip->data_buffer);
+ spin_unlock(&driver_lock);
return 0;
}
@@ -665,10 +665,14 @@ dev_num_search_complete:
return -ENODEV;
}
+ spin_lock(&driver_lock);
+
pci_set_drvdata(pci_dev, chip);
list_add(&chip->list, &tpm_chip_list);
+ spin_unlock(&driver_lock);
+
for (i = 0; i < TPM_NUM_ATTR; i++)
device_create_file(&pci_dev->dev, &chip->vendor->attr[i]);
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH 12 of 12] Fix Tpm driver -- locks
@ 2005-05-05 19:12 Kylene Hall
0 siblings, 0 replies; 2+ messages in thread
From: Kylene Hall @ 2005-05-05 19:12 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel
Please apply these fixes to the Tpm driver. I am resubmitting the entire
patch set that was orginally sent to LKML on April 27 with the changes
that were requested fixed.
This patch was updated to reflect a change in a previous patch in this
set so it will cleanly apply.
Thanks,
Kylie
A lock in the register hardware is missing and the one in release is
misplaced. This patch fixes these issues.
Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
---
--- linux-2.6.12-rc2/drivers/char/tpm/tpm.c 2005-04-27 14:19:17.000000000 -0500
+++ linux-2.6.12-rc2-tpmdd/drivers/char/tpm/tpm.c 2005-04-27 14:25:04.000000000 -0500
@@ -445,15 +445,15 @@ EXPORT_SYMBOL_GPL(tpm_open);
int tpm_release(struct inode *inode, struct file *file)
{
struct tpm_chip *chip = file->private_data;
-
- file->private_data = NULL;
spin_lock(&driver_lock);
+ file->private_data = NULL;
chip->num_opens--;
del_singleshot_timer_sync(&chip->user_read_timer);
atomic_set(&chip->data_pending, 0);
-
pci_dev_put(chip->pci_dev);
+ kfree(chip->data_buffer);
+ spin_unlock(&driver_lock);
return 0;
}
@@ -665,9 +665,13 @@ dev_num_search_complete:
return -ENODEV;
}
+ spin_lock(&driver_lock);
+
pci_set_drvdata(pci_dev, chip);
list_add(&chip->list, &tpm_chip_list);
+ spin_unlock(&driver_lock);
+
sysfs_create_group(&pci_dev->dev.kobj, chip->vendor->attr_group);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-05-05 19:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-04-27 22:19 [PATCH 12 of 12] Fix Tpm driver -- locks Kylene Hall
2005-05-05 19:12 Kylene Hall
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®