diff options
| -rw-r--r-- | linux/drivers/media/video/compat_ioctl32.c | 2 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/linux/drivers/media/video/compat_ioctl32.c b/linux/drivers/media/video/compat_ioctl32.c index 467a6d44b..8314f1776 100644 --- a/linux/drivers/media/video/compat_ioctl32.c +++ b/linux/drivers/media/video/compat_ioctl32.c @@ -491,7 +491,7 @@ static int do_set_window(struct file *file, unsigned int cmd, unsigned long arg) } } - return native_ioctl(file, VIDIOCSWIN, (unsigned long)p); + return native_ioctl(file, VIDIOCSWIN, (unsigned long)vw); } static int do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arg) diff --git a/v4l/ChangeLog b/v4l/ChangeLog index eb4c1f1c0..c3c22d10d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2006-01-04 21:51 mchehab + + * linux/drivers/media/video/compat_ioctl32.c: (do_set_window): + - There is a bug in the ioctl translations from 32bit userspace + to 64bit kernelspace in do_set_window(). + - The video window (vw) should be passed to native_ioctl() + instead of the video clip. + + Signed-off-by: Guy Martin <gmsoft@tuxicoman.be> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2006-01-04 13:28 mkrufky * linux/Documentation/video4linux/CARDLIST.saa7134: |