aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorHannes Eder <hannes@hanneseder.net>2008-12-13 00:19:18 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-13 00:19:18 -0500
commitc46f0a2d40f7ceb5fb696309bcd088ac75d0fe20 (patch)
tree01be89d4eb3d5bd3bf8479ef78e5d1446f5f6fba /drivers/isdn
parent047ce8f207b144eb9be094ce7427d6e11a687010 (diff)
mISDN: timerdev: use __user for mISDN_read's buffer argument
Fix this warning: drivers/isdn/mISDN/timerdev.c:264:11: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/isdn/mISDN/timerdev.c:264:11: expected int ( *read )( ... ) drivers/isdn/mISDN/timerdev.c:264:11: got int ( static [toplevel] *<noident> )( ... ) Signed-off-by: Hannes Eder <hannes@hanneseder.net> Acked-by: Karsten Keil <kkeil@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/mISDN/timerdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index 62b5e49684e5..f2b32186d4a1 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -86,7 +86,7 @@ mISDN_close(struct inode *ino, struct file *filep)
86} 86}
87 87
88static ssize_t 88static ssize_t
89mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off) 89mISDN_read(struct file *filep, char __user *buf, size_t count, loff_t *off)
90{ 90{
91 struct mISDNtimerdev *dev = filep->private_data; 91 struct mISDNtimerdev *dev = filep->private_data;
92 struct mISDNtimer *timer; 92 struct mISDNtimer *timer;
@@ -116,7 +116,7 @@ mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off)
116 timer = (struct mISDNtimer *)dev->expired.next; 116 timer = (struct mISDNtimer *)dev->expired.next;
117 list_del(&timer->list); 117 list_del(&timer->list);
118 spin_unlock_irqrestore(&dev->lock, flags); 118 spin_unlock_irqrestore(&dev->lock, flags);
119 if (put_user(timer->id, (int *)buf)) 119 if (put_user(timer->id, (int __user *)buf))
120 ret = -EFAULT; 120 ret = -EFAULT;
121 else 121 else
122 ret = sizeof(int); 122 ret = sizeof(int);