redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] tpm: dev_mask handling fix

Browse source 
- Use ~, not !

- Remove unneeded cast

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Kylene Jo Hall 2005-11-13 16:07:42 -08:00 committed by Linus Torvalds
parent ad5ea3cc5f
commit f6a2382cec
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/char/tpm/tpm.c
View file

@ -428,8 +428,7 @@ ssize_t tpm_read(struct file * file, char __user *buf,
ret_size = size; ret_size = size;
down(&chip->buffer_mutex); down(&chip->buffer_mutex);
if (copy_to_user if (copy_to_user(buf, chip->data_buffer, ret_size))
((void __user *) buf, chip->data_buffer, ret_size))
ret_size = -EFAULT; ret_size = -EFAULT;
up(&chip->buffer_mutex); up(&chip->buffer_mutex);
} }
@ -460,7 +459,7 @@ void tpm_remove_hardware(struct device *dev)
sysfs_remove_group(&dev->kobj, chip->vendor->attr_group); sysfs_remove_group(&dev->kobj, chip->vendor->attr_group);
dev_mask[chip->dev_num / TPM_NUM_MASK_ENTRIES ] &= 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); kfree(chip);