Commit 5e976d55 authored by Kylene Hall's avatar Kylene Hall Committed by Linus Torvalds
Browse files

[PATCH] tpm: locking fixes 



Add a missing lock in the register hardware and fix a misplaced lock release
release.

Signed-off-by: default avatarKylene Hall <kjhall@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d9e5b6bf

drivers/char/tpm/tpm.c

+7 −3
Original line number Diff line number Diff line
@@ -448,14 +448,14 @@ 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 @@ int tpm_register_hardware(struct pci_dev *pci_dev, 
		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);



	return 0;