diff options
| author | Hans Verkuil <devnull@localhost> | 2005-11-12 23:12:53 +0000 |
|---|---|---|
| committer | Hans Verkuil <devnull@localhost> | 2005-11-12 23:12:53 +0000 |
| commit | 68bee46a58e8a58c55a5991123ec927df939d420 (patch) | |
| tree | b63ba5c2f2dab5c4674fb0f3d0b14bc001598afe | |
| parent | ae044a08f3f0208468ac2dfa4b22fcb68d6dd043 (diff) | |
| download | mediapointer-dvb-s2-68bee46a58e8a58c55a5991123ec927df939d420.tar.gz mediapointer-dvb-s2-68bee46a58e8a58c55a5991123ec927df939d420.tar.bz2 | |
64-bit fixes esp. for broken compat_ioctl32.
From:
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
| -rw-r--r-- | linux/drivers/media/video/compat_ioctl32.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-core.c | 2 | ||||
| -rw-r--r-- | v4l/ChangeLog | 15 | ||||
| -rw-r--r-- | v4l/compat.h | 4 |
4 files changed, 20 insertions, 5 deletions
diff --git a/linux/drivers/media/video/compat_ioctl32.c b/linux/drivers/media/video/compat_ioctl32.c index 0321ae294..8defd77d8 100644 --- a/linux/drivers/media/video/compat_ioctl32.c +++ b/linux/drivers/media/video/compat_ioctl32.c @@ -3,6 +3,7 @@ #include "compat.h" #include <linux/videodev.h> #include <linux/module.h> +#include <linux/smp_lock.h> #ifdef CONFIG_COMPAT struct video_tuner32 { @@ -308,9 +309,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) case _IOR('v' , BASE_VIDIOCPRIVATE+7, int): ret = native_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); break; - - return ret; } + return ret; } #else long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c index 8491dbd0a..a07ddce59 100644 --- a/linux/drivers/media/video/em28xx/em28xx-core.c +++ b/linux/drivers/media/video/em28xx/em28xx-core.c @@ -167,7 +167,7 @@ u32 em28xx_request_buffers(struct em28xx *dev, u32 count) const size_t imagesize = PAGE_ALIGN(dev->frame_size); /*needs to be page aligned cause the buffers can be mapped individually! */ void *buff = NULL; u32 i; - em28xx_coredbg("requested %i buffers with size %i", count, imagesize); + em28xx_coredbg("requested %i buffers with size %zi", count, imagesize); if (count > EM28XX_NUM_FRAMES) count = EM28XX_NUM_FRAMES; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index bb724fbde..997383782 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,18 @@ +2005-11-12 22:57 hverkuil + + * ../linux/drivers/media/video/compat_ioctl32.c: + - Fixed 64-bit bug: a wrongly placed return + in compat_ioctl32.c broke 32-bit compatibility ioctl support. + + * ../linux/drivers/media/video/em28xx/em28xx-core.c: + - Fix a 64-bit compile warning due to a wrong printk format. + + * ../v4l/compat.h: + - Fixed 2.6.13 support: kzalloc appeared in 2.6.14, not + 2.6.13. Also added missing smp_lock.h #include. + + Signed-off-by: hverkuil <hverkuil@xs4all.nl> + 2005-11-12 00:06 mchehab * ../linux/drivers/media/video/Makefile: diff --git a/v4l/compat.h b/v4l/compat.h index 94ff08586..df1fadb5d 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.31 2005/11/09 21:54:53 nsh Exp $ + * $Id: compat.h,v 1.32 2005/11/12 23:12:53 hverkuil Exp $ */ #ifndef _COMPAT_H @@ -239,7 +239,7 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) #endif #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) #ifndef kzalloc #define kzalloc(size, flags) \ ({ \ |