Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc36d32c authored by Rajiv Andrade's avatar Rajiv Andrade Committed by James Morris
Browse files

Renames num_open to is_open, as only one process can open the file at a time. 



Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: default avatarRajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: "Serge E. Hallyn" <serue@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent f89c5edb

drivers/char/tpm/tpm.c

+3 −4
Original line number Diff line number Diff line
@@ -978,20 +978,19 @@ int tpm_open(struct inode *inode, struct file *file) 
		goto err_out;

	}



	if (chip->num_opens) {

	if (test_and_set_bit(0, &chip->is_open)) {

		dev_dbg(chip->dev, "Another process owns this TPM\n");

		rc = -EBUSY;

		goto err_out;

	}



	chip->num_opens++;

	get_device(chip->dev);



	spin_unlock(&driver_lock);



	chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);

	if (chip->data_buffer == NULL) {

		chip->num_opens--;

		clear_bit(0, &chip->is_open);

		put_device(chip->dev);

		return -ENOMEM;

	}
@@ -1016,7 +1015,7 @@ int tpm_release(struct inode *inode, struct file *file) 
	file->private_data = NULL;

	del_singleshot_timer_sync(&chip->user_read_timer);

	atomic_set(&chip->data_pending, 0);

	chip->num_opens--;

	clear_bit(0, &chip->is_open);

	put_device(chip->dev);

	kfree(chip->data_buffer);

	spin_unlock(&driver_lock);

drivers/char/tpm/tpm.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct tpm_chip { 
	struct device *dev;	/* Device stuff */



	int dev_num;		/* /dev/tpm# */

	int num_opens;		/* only one allowed */

	unsigned long is_open;	/* only one allowed */

	int time_expired;



	/* Data passed to and from the tpm via the read/write calls */