diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-08-31 08:23:58 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-08-31 08:23:58 +0200 |
| commit | 83027ea1202394a80ca58ed8da84e207d855521e (patch) | |
| tree | e785ac503165d57d3a5cfb88f20eff034d12199f /linux/drivers/media/video/gspca | |
| parent | f1a52a2e70204db19b6c81bb59de2c759cefaaa6 (diff) | |
| parent | 7804585be37d9aa982df2d476a795cbe459dae4a (diff) | |
| download | mediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.gz mediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/gspca')
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index 793a6f8f0..194abf686 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -1410,7 +1410,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, i = ret; /* frame index */ frame = &gspca_dev->frame[i]; if (gspca_dev->memory == V4L2_MEMORY_USERPTR) { - if (copy_to_user((__u8 *) frame->v4l2_buf.m.userptr, + if (copy_to_user((__u8 __user *) frame->v4l2_buf.m.userptr, frame->data, frame->v4l2_buf.bytesused)) { PDEBUG(D_ERR|D_STREAM, |