---

yaml --- r: 9423 b: refs/heads/master c: ae8aed0 h: refs/heads/master i: 9421: 719e0ee 9419: dd802e6 9415: e9b546d 9407: 351d741 v: v3
git-mirror · Sep 29, 2005 · 1224928 · 1224928
1 parent 318acaf
commit 1224928
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be88ec74cb48d1f60d0c0f059843f846f4481d87
+refs/heads/master: ae8aed0314064da3002879fedc2d262c72865a17
diff --git a/trunk/drivers/media/video/rds.h b/trunk/drivers/media/video/rds.h
@@ -31,7 +31,7 @@
 struct rds_command {
 	unsigned int  block_count;
 	int           result;
-	unsigned char *buffer;
+	unsigned char __user *buffer;
 	struct file   *instance;
 	poll_table    *event_list;
 };

diff --git a/trunk/drivers/media/video/saa6588.c b/trunk/drivers/media/video/saa6588.c
@@ -157,7 +157,7 @@ static struct i2c_client client_template;
 
 /* ---------------------------------------------------------------------- */
 
-static int block_to_user_buf(struct saa6588 *s, unsigned char *user_buf)
+static int block_to_user_buf(struct saa6588 *s, unsigned char __user *user_buf)
 {
 	int i;
 
@@ -191,7 +191,7 @@ static void read_from_buf(struct saa6588 *s, struct rds_command *a)
 {
 	unsigned long flags;
 
-	unsigned char *buf_ptr = a->buffer;	/* This is a user space buffer! */
+	unsigned char __user *buf_ptr = a->buffer;
 	unsigned int i;
 	unsigned int rd_blocks;