The patch number 9907 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[email protected]
------
From: Mauro Carvalho Chehab <[email protected]>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/video/sh_mobile_ceu_camera.c | 2 +-
linux/drivers/media/video/v4l2-compat-ioctl32.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff -r 086c580cf0e7 -r e8cd8ab9a036
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Tue Dec 16 10:46:32
2008 +0100
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Tue Dec 16 15:28:02
2008 -0200
@@ -448,7 +448,7 @@ static int sh_mobile_ceu_set_fmt(struct
static int sh_mobile_ceu_set_fmt(struct soc_camera_device *icd,
__u32 pixfmt, struct v4l2_rect *rect)
{
- const struct soc_camera_data_format *cam_fmt;
+ const struct soc_camera_data_format *cam_fmt = NULL;
int ret;
/*
diff -r 086c580cf0e7 -r e8cd8ab9a036
linux/drivers/media/video/v4l2-compat-ioctl32.c
--- a/linux/drivers/media/video/v4l2-compat-ioctl32.c Tue Dec 16 10:46:32
2008 +0100
+++ b/linux/drivers/media/video/v4l2-compat-ioctl32.c Tue Dec 16 15:28:02
2008 -0200
@@ -887,7 +887,7 @@ long v4l_compat_ioctl32(struct file *fil
{
int ret = -ENOIOCTLCMD;
- if (!file->f_op->ioctl)
+ if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl)
return ret;
switch (cmd) {
@@ -977,6 +977,8 @@ long v4l_compat_ioctl32(struct file *fil
#endif
default:
v4l_print_ioctl("compat_ioctl32", cmd);
+ printk(KERN_CONT "\n");
+ break;
}
return ret;
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/e8cd8ab9a03660118ea6fabd254d82553c57fa35
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
