diff --git a/[refs] b/[refs]
index 5603b07ccd28..aacec6ef0258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f10095c3ecb2116ef8b8fa7a56bd9f8b5fd89031
+refs/heads/master: 97cf010aeb03fd515613313ad43508e49acae7fb
diff --git a/trunk/drivers/media/video/zr364xx.c b/trunk/drivers/media/video/zr364xx.c
index 1b44784d0efb..04949c823654 100644
--- a/trunk/drivers/media/video/zr364xx.c
+++ b/trunk/drivers/media/video/zr364xx.c
@@ -390,7 +390,7 @@ static int read_frame(struct zr364xx_camera *cam, int framenum)
 }
 
 
-static ssize_t zr364xx_read(struct file *file, char *buf, size_t cnt,
+static ssize_t zr364xx_read(struct file *file, char __user *buf, size_t cnt,
 			    loff_t * ppos)
 {
 	unsigned long count = cnt;