From 17ea8b7f4f01d6525acbdfc38e1ada9ac0801f2b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 9 Feb 2007 16:38:20 +0000
Subject: [PATCH] --- yaml --- r: 47256 b: refs/heads/master c:
 8a5ab4157b3933d4fa29a1612879ab08f681041a h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/media/video/usbvision/usbvision-video.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1775f5a61b79..f3320cb93cab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7bde2fe043c2f7ddcf1d8bec139684ef774c8bc
+refs/heads/master: 8a5ab4157b3933d4fa29a1612879ab08f681041a
diff --git a/trunk/drivers/media/video/usbvision/usbvision-video.c b/trunk/drivers/media/video/usbvision/usbvision-video.c
index 7243337b771a..bdd6301d2a47 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-video.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-video.c
@@ -1072,7 +1072,7 @@ static int usbvision_v4l2_ioctl(struct inode *inode, struct file *file,
 }
 
 
-static ssize_t usbvision_v4l2_read(struct file *file, char *buf,
+static ssize_t usbvision_v4l2_read(struct file *file, char __user *buf,
 		      size_t count, loff_t *ppos)
 {
 	struct video_device *dev = video_devdata(file);