diff options
| author | Al Viro | 2005-09-29 01:37:34 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-29 17:46:27 +0200 |
| commit | ae8aed0314064da3002879fedc2d262c72865a17 (patch) | |
| tree | fdb7d2d6c62a218f61c8537122a05899b9373d1c /drivers/media | |
| parent | [PATCH] i810-i2c iomem annotations (diff) | |
| download | kernel-qcow2-linux-ae8aed0314064da3002879fedc2d262c72865a17.tar.gz kernel-qcow2-linux-ae8aed0314064da3002879fedc2d262c72865a17.tar.xz kernel-qcow2-linux-ae8aed0314064da3002879fedc2d262c72865a17.zip | |
[PATCH] saa6588 __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/rds.h | 2 | ||||
| -rw-r--r-- | drivers/media/video/saa6588.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/rds.h b/drivers/media/video/rds.h index 30337d0f1a87..0d30eb744e61 100644 --- a/drivers/media/video/rds.h +++ b/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/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c index 1a657a70ff43..72b70eb5da1d 100644 --- a/drivers/media/video/saa6588.c +++ b/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; |