Commit ae8aed03 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] saa6588 __user annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent be88ec74

drivers/media/video/rds.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

};

drivers/media/video/saa6588.c

+2 −2
Original line number Diff line number Diff line
@@ -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;