From f0fd62b3dba390bc67ac012d98b8588a976f9111 Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Fri, 12 Dec 2008 21:19:18 -0800
Subject: [PATCH] --- yaml --- r: 122599 b: refs/heads/master c:
 c46f0a2d40f7ceb5fb696309bcd088ac75d0fe20 h: refs/heads/master i:   122597:
 dc74b9e10283a27d0b1ae377698f92be0b884b81   122595:
 7bbe24d14741f9a1dd19328d42edd1767d841d82   122591:
 92e251338ad4f90bdca889cef2cc14a0cb989967 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/isdn/mISDN/timerdev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e8421d9bae06..60f13d42fa96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 047ce8f207b144eb9be094ce7427d6e11a687010
+refs/heads/master: c46f0a2d40f7ceb5fb696309bcd088ac75d0fe20
diff --git a/trunk/drivers/isdn/mISDN/timerdev.c b/trunk/drivers/isdn/mISDN/timerdev.c
index 62b5e49684e5..f2b32186d4a1 100644
--- a/trunk/drivers/isdn/mISDN/timerdev.c
+++ b/trunk/drivers/isdn/mISDN/timerdev.c
@@ -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;
@@ -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);