From 12249284441408c35e1788bbb2a4b9ad7dc25b60 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 29 Sep 2005 00:37:34 +0100 Subject: [PATCH] --- yaml --- r: 9423 b: refs/heads/master c: ae8aed0314064da3002879fedc2d262c72865a17 h: refs/heads/master i: 9421: 719e0eef725f27a5ac6ea5c0cf3f1b448615fc6c 9419: dd802e61ac943b313fd626e130ff1b6e6c7916d2 9415: e9b546de31d440b48e97195abf0de6d1eec41608 9407: 351d74156788e9502b22cb939968b4a4e027f6f4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/rds.h | 2 +- trunk/drivers/media/video/saa6588.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4a3f12fdbc29..c8d4b2addce0 100644 --- 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 index 30337d0f1a87..0d30eb744e61 100644 --- 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 index 1a657a70ff43..72b70eb5da1d 100644 --- 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;