Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26109
b: refs/heads/master
c: 3c2f606
h: refs/heads/master
i:
  26107: 518fc0f
v: v3
  • Loading branch information
Kylene Jo Hall authored and Linus Torvalds committed Apr 22, 2006
1 parent fb3aad8 commit cba9b9a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7c69a47f1badf40dfa2febac71df98d32b1b56d7
refs/heads/master: 3c2f606a098b07f053904ec8b8f4d0e101c28b35
9 changes: 4 additions & 5 deletions trunk/drivers/char/tpm/tpm.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static void user_reader_timeout(unsigned long ptr)
schedule_work(&chip->work);
}

static void timeout_work(void * ptr)
static void timeout_work(void *ptr)
{
struct tpm_chip *chip = ptr;

Expand Down Expand Up @@ -387,7 +387,7 @@ int tpm_release(struct inode *inode, struct file *file)
EXPORT_SYMBOL_GPL(tpm_release);

ssize_t tpm_write(struct file *file, const char __user *buf,
size_t size, loff_t * off)
size_t size, loff_t *off)
{
struct tpm_chip *chip = file->private_data;
int in_size = size, out_size;
Expand Down Expand Up @@ -419,11 +419,10 @@ ssize_t tpm_write(struct file *file, const char __user *buf,

return in_size;
}

EXPORT_SYMBOL_GPL(tpm_write);

ssize_t tpm_read(struct file * file, char __user *buf,
size_t size, loff_t * off)
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;
Expand Down

0 comments on commit cba9b9a

Please sign in to comment.