Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122599
b: refs/heads/master
c: c46f0a2
h: refs/heads/master
i:
  122597: dc74b9e
  122595: 7bbe24d
  122591: 92e2513
v: v3
  • Loading branch information
Hannes Eder authored and David S. Miller committed Dec 13, 2008
1 parent f7cb971 commit f0fd62b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 047ce8f207b144eb9be094ce7427d6e11a687010
refs/heads/master: c46f0a2d40f7ceb5fb696309bcd088ac75d0fe20
4 changes: 2 additions & 2 deletions trunk/drivers/isdn/mISDN/timerdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ mISDN_close(struct inode *ino, struct file *filep)
}

static ssize_t
mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off)
mISDN_read(struct file *filep, char __user *buf, size_t count, loff_t *off)
{
struct mISDNtimerdev *dev = filep->private_data;
struct mISDNtimer *timer;
Expand Down Expand Up @@ -116,7 +116,7 @@ mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off)
timer = (struct mISDNtimer *)dev->expired.next;
list_del(&timer->list);
spin_unlock_irqrestore(&dev->lock, flags);
if (put_user(timer->id, (int *)buf))
if (put_user(timer->id, (int __user *)buf))
ret = -EFAULT;
else
ret = sizeof(int);
Expand Down

0 comments on commit f0fd62b

Please sign in to comment.