git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (8773): cx18: Fix cx18_find_handle() and add error checking
[safe/jmp/linux-2.6]
/
drivers
/
media
/
video
/
v4l2-ioctl.c
diff --git
a/drivers/media/video/v4l2-ioctl.c
b/drivers/media/video/v4l2-ioctl.c
index
fdfe773
..
140ef92
100644
(file)
--- a/
drivers/media/video/v4l2-ioctl.c
+++ b/
drivers/media/video/v4l2-ioctl.c
@@
-499,7
+499,7
@@
static void dbgbuf(unsigned int cmd, struct video_device *vfd,
p->timestamp.tv_sec / 3600,
(int)(p->timestamp.tv_sec / 60) % 60,
(int)(p->timestamp.tv_sec % 60),
p->timestamp.tv_sec / 3600,
(int)(p->timestamp.tv_sec / 60) % 60,
(int)(p->timestamp.tv_sec % 60),
- p->timestamp.tv_usec,
+
(long)
p->timestamp.tv_usec,
p->index,
prt_names(p->type, v4l2_type_names),
p->bytesused, p->flags,
p->index,
prt_names(p->type, v4l2_type_names),
p->bytesused, p->flags,
@@
-674,7
+674,7
@@
static int __video_do_ioctl(struct inode *inode, struct file *file,
__video_do_ioctl will be called again, with one or more
V4L2 ioctls.
********************************************************/
__video_do_ioctl will be called again, with one or more
V4L2 ioctls.
********************************************************/
- if (_IOC_TYPE(cmd) == 'v')
+ if (_IOC_TYPE(cmd) == 'v'
&& _IOC_NR(cmd) < BASE_VIDIOCPRIVATE
)
return v4l_compat_translate_ioctl(inode, file, cmd, arg,
__video_do_ioctl);
#endif
return v4l_compat_translate_ioctl(inode, file, cmd, arg,
__video_do_ioctl);
#endif