leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] tpm: read return code issue

Browse Source 
Replace an erroneous return code for the read function when no data is
available.

Signed-of-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 Hall 2005-06-23 22:01:53 -07:00 committed by Linus Torvalds
parent f87ea32ae2
commit 5b44bd5806
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/char/tpm/tpm.c
View File

@ -489,29 +489,19 @@ ssize_t tpm_read(struct file * file, char __user * buf,
size_t size, loff_t * off)
{
struct tpm_chip *chip = file->private_data;
int ret_size = -ENODATA;
int ret_size;
if (atomic_read(&chip->data_pending) != 0) { /* Result available */
down(&chip->timer_manipulation_mutex);
del_singleshot_timer_sync(&chip->user_read_timer);
up(&chip->timer_manipulation_mutex);
del_singleshot_timer_sync(&chip->user_read_timer);
ret_size = atomic_read(&chip->data_pending);
atomic_set(&chip->data_pending, 0);
if (ret_size > 0) { /* relay data */
if (size < ret_size)
ret_size = size;
down(&chip->buffer_mutex);
ret_size = atomic_read(&chip->data_pending);
atomic_set(&chip->data_pending, 0);
if (ret_size == 0) /* timeout just occurred */
ret_size = -ETIME;
else if (ret_size > 0) { /* relay data */
if (size < ret_size)
ret_size = size;
if (copy_to_user((void __user *) buf,
chip->data_buffer, ret_size)) {
ret_size = -EFAULT;
}
}
if (copy_to_user
((void __user *) buf, chip->data_buffer, ret_size))
ret_size = -EFAULT;
up(&chip->buffer_mutex);
}