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

Commit f6a2382c authored by Kylene Jo Hall's avatar Kylene Jo Hall Committed by Linus Torvalds
Browse files

[PATCH] tpm: dev_mask handling fix 



- Use ~, not !

- Remove unneeded cast

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 ad5ea3cc

drivers/char/tpm/tpm.c

+2 −3
Original line number Diff line number Diff line
@@ -428,8 +428,7 @@ ssize_t tpm_read(struct file * file, char __user *buf, 
			ret_size = size;



		down(&chip->buffer_mutex);

		if (copy_to_user

		    ((void __user *) buf, chip->data_buffer, ret_size))

		if (copy_to_user(buf, chip->data_buffer, ret_size))

			ret_size = -EFAULT;

		up(&chip->buffer_mutex);

	}
@@ -460,7 +459,7 @@ void tpm_remove_hardware(struct device *dev) 
	sysfs_remove_group(&dev->kobj, chip->vendor->attr_group);



	dev_mask[chip->dev_num / TPM_NUM_MASK_ENTRIES ] &=

		!(1 << (chip->dev_num % TPM_NUM_MASK_ENTRIES));

		~(1 << (chip->dev_num % TPM_NUM_MASK_ENTRIES));



	kfree(chip);