Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 355056
b: refs/heads/master
c: 890537b
h: refs/heads/master
v: v3
  • Loading branch information
Hans Grob authored and Greg Kroah-Hartman committed Feb 6, 2013
1 parent a26a6bf commit 87c5553
Show file tree
Hide file tree
Showing 2 changed files with 6 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: 0731572b6c529f8e8a320dc4df6d67d9a595ecf3
refs/heads/master: 890537b3ac953ad2cc4f5ecb83744e967ae2aa31
10 changes: 5 additions & 5 deletions trunk/drivers/char/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
{
unsigned long p = *ppos;
ssize_t low_count, read, sz;
char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
int err = 0;

read = 0;
Expand Down Expand Up @@ -527,7 +527,7 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
unsigned long p = *ppos;
ssize_t wrote = 0;
ssize_t virtr = 0;
char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
int err = 0;

if (p < (unsigned long) high_memory) {
Expand Down Expand Up @@ -595,7 +595,7 @@ static ssize_t write_port(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
unsigned long i = *ppos;
const char __user * tmp = buf;
const char __user *tmp = buf;

if (!access_ok(VERIFY_READ, buf, count))
return -EFAULT;
Expand Down Expand Up @@ -729,7 +729,7 @@ static loff_t memory_lseek(struct file *file, loff_t offset, int orig)
return ret;
}

static int open_port(struct inode * inode, struct file * filp)
static int open_port(struct inode *inode, struct file *filp)
{
return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
}
Expand Down Expand Up @@ -898,7 +898,7 @@ static int __init chr_dev_init(void)
continue;

/*
* Create /dev/port?
* Create /dev/port?
*/
if ((minor == DEVPORT_MINOR) && !arch_has_dev_port())
continue;
Expand Down

0 comments on commit 87c5553

Please sign in to comment.