The patch number 9957 was added via Hans Verkuil <[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: Hans Verkuil <[email protected]>
v4l2-subdev: add g_sliced_vbi_cap and add NULL pointer checks
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
---
linux/drivers/media/video/v4l2-subdev.c | 10 ++++++----
linux/include/media/v4l2-subdev.h | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff -r d2eedb425718 -r f7941bef27ed linux/drivers/media/video/v4l2-subdev.c
--- a/linux/drivers/media/video/v4l2-subdev.c Thu Dec 18 07:28:35 2008 -0200
+++ b/linux/drivers/media/video/v4l2-subdev.c Thu Dec 18 15:16:24 2008 +0100
@@ -40,13 +40,13 @@ int v4l2_subdev_command(struct v4l2_subd
case VIDIOC_G_CHIP_IDENT:
return v4l2_subdev_call(sd, core, g_chip_ident, arg);
case VIDIOC_INT_S_STANDBY:
- return v4l2_subdev_call(sd, core, s_standby, *(u32 *)arg);
+ return v4l2_subdev_call(sd, core, s_standby, arg ? (*(u32
*)arg) : 0);
case VIDIOC_INT_RESET:
- return v4l2_subdev_call(sd, core, reset, *(u32 *)arg);
+ return v4l2_subdev_call(sd, core, reset, arg ? (*(u32 *)arg) :
0);
case VIDIOC_INT_S_GPIO:
- return v4l2_subdev_call(sd, core, s_gpio, *(u32 *)arg);
+ return v4l2_subdev_call(sd, core, s_gpio, arg ? (*(u32 *)arg) :
0);
case VIDIOC_INT_INIT:
- return v4l2_subdev_call(sd, core, init, *(u32 *)arg);
+ return v4l2_subdev_call(sd, core, init, arg ? (*(u32 *)arg) :
0);
#ifdef CONFIG_VIDEO_ADV_DEBUG
case VIDIOC_DBG_G_REGISTER:
return v4l2_subdev_call(sd, core, g_register, arg);
@@ -90,6 +90,8 @@ int v4l2_subdev_command(struct v4l2_subd
return v4l2_subdev_call(sd, video, s_vbi_data, arg);
case VIDIOC_INT_G_VBI_DATA:
return v4l2_subdev_call(sd, video, g_vbi_data, arg);
+ case VIDIOC_G_SLICED_VBI_CAP:
+ return v4l2_subdev_call(sd, video, g_sliced_vbi_cap, arg);
case VIDIOC_S_FMT:
return v4l2_subdev_call(sd, video, s_fmt, arg);
case VIDIOC_G_FMT:
diff -r d2eedb425718 -r f7941bef27ed linux/include/media/v4l2-subdev.h
--- a/linux/include/media/v4l2-subdev.h Thu Dec 18 07:28:35 2008 -0200
+++ b/linux/include/media/v4l2-subdev.h Thu Dec 18 15:16:24 2008 +0100
@@ -110,6 +110,7 @@ struct v4l2_subdev_video_ops {
int (*decode_vbi_line)(struct v4l2_subdev *sd, struct
v4l2_decode_vbi_line *vbi_line);
int (*s_vbi_data)(struct v4l2_subdev *sd, const struct
v4l2_sliced_vbi_data *vbi_data);
int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data
*vbi_data);
+ int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct
v4l2_sliced_vbi_cap *cap);
int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std);
int (*s_stream)(struct v4l2_subdev *sd, int enable);
int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/f7941bef27edd8e1b08fed01aa42648b72da530f
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
