diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /drivers/media/video/saa6588.c | |
| parent | 2995bfb7855aabd493f840af361f3dd7d221caea (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/saa6588.c')
| -rw-r--r-- | drivers/media/video/saa6588.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; | |||
| 157 | 157 | ||
| 158 | /* ---------------------------------------------------------------------- */ | 158 | /* ---------------------------------------------------------------------- */ |
| 159 | 159 | ||
| 160 | static int block_to_user_buf(struct saa6588 *s, unsigned char *user_buf) | 160 | static int block_to_user_buf(struct saa6588 *s, unsigned char __user *user_buf) |
| 161 | { | 161 | { |
| 162 | int i; | 162 | int i; |
| 163 | 163 | ||
| @@ -191,7 +191,7 @@ static void read_from_buf(struct saa6588 *s, struct rds_command *a) | |||
| 191 | { | 191 | { |
| 192 | unsigned long flags; | 192 | unsigned long flags; |
| 193 | 193 | ||
| 194 | unsigned char *buf_ptr = a->buffer; /* This is a user space buffer! */ | 194 | unsigned char __user *buf_ptr = a->buffer; |
| 195 | unsigned int i; | 195 | unsigned int i; |
| 196 | unsigned int rd_blocks; | 196 | unsigned int rd_blocks; |
| 197 | 197 | ||