summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-02-12 18:05:57 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-12 18:05:57 -0200
commitb992a5329b3e48767b3bbfbc0ade73f9f560a552 (patch)
treec5eae8264ca112b8cf13f82d95d20b23c0938b70 /linux
parentfe13e147a7c65a93afe394f14e57b3315fc0697c (diff)
downloadmediapointer-dvb-s2-b992a5329b3e48767b3bbfbc0ade73f9f560a552.tar.gz
mediapointer-dvb-s2-b992a5329b3e48767b3bbfbc0ade73f9f560a552.tar.bz2
Backport header fix from kernel
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Original patch from Al Viro <viro@ftp.linux.org.uk> usbvision missing __user Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/usbvision/usbvision-video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c
index e49064de8..1d0d61469 100644
--- a/linux/drivers/media/video/usbvision/usbvision-video.c
+++ b/linux/drivers/media/video/usbvision/usbvision-video.c
@@ -1112,7 +1112,7 @@ static long usbvision_v4l2_read(struct video_device *dev, char *buf,
{
struct usb_usbvision *usbvision = (struct usb_usbvision *) dev;
#else
-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);