diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-19 18:26:23 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:29 -0400 |
commit | 80c6e358c1b6da0b9aa97e10c82317b7104821bb (patch) | |
tree | 9b678405539eb51541177525bc2ef6e4adbe589b /drivers/media/video/au0828/au0828-video.c | |
parent | 06e9509ff3484578c111bbc6f9e0e97c086a1131 (diff) |
V4L/DVB (11109): au0828: Fix compilation when VIDEO_ADV_DEBUG = n
As reported by Kyle McMartin and Randy Dunlap:
drivers/media/video/au0828/au0828-video.c:1438: error: 'const struct v4l2_subdev_core_ops' has no member named 'g_register'
drivers/media/video/au0828/au0828-video.c:1453: error: 'const struct v4l2_subdev_core_ops' has no member named 's_register'
This patch properly implements those two API ioctls only when debug is
enabled.
Cc: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/au0828/au0828-video.c')
-rw-r--r-- | drivers/media/video/au0828/au0828-video.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c index 5de968e128f6..d3a388af46e7 100644 --- a/drivers/media/video/au0828/au0828-video.c +++ b/drivers/media/video/au0828/au0828-video.c | |||
@@ -1427,6 +1427,7 @@ static int vidioc_streamoff(struct file *file, void *priv, | |||
1427 | return 0; | 1427 | return 0; |
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | #ifdef CONFIG_VIDEO_ADV_DEBUG | ||
1430 | static int vidioc_g_register(struct file *file, void *priv, | 1431 | static int vidioc_g_register(struct file *file, void *priv, |
1431 | struct v4l2_dbg_register *reg) | 1432 | struct v4l2_dbg_register *reg) |
1432 | { | 1433 | { |
@@ -1457,6 +1458,7 @@ static int vidioc_s_register(struct file *file, void *priv, | |||
1457 | } | 1458 | } |
1458 | return 0; | 1459 | return 0; |
1459 | } | 1460 | } |
1461 | #endif | ||
1460 | 1462 | ||
1461 | static int vidioc_reqbufs(struct file *file, void *priv, | 1463 | static int vidioc_reqbufs(struct file *file, void *priv, |
1462 | struct v4l2_requestbuffers *rb) | 1464 | struct v4l2_requestbuffers *rb) |
@@ -1578,8 +1580,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
1578 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1580 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
1579 | .vidioc_g_register = vidioc_g_register, | 1581 | .vidioc_g_register = vidioc_g_register, |
1580 | .vidioc_s_register = vidioc_s_register, | 1582 | .vidioc_s_register = vidioc_s_register, |
1581 | .vidioc_g_chip_ident = vidioc_g_chip_ident, | ||
1582 | #endif | 1583 | #endif |
1584 | .vidioc_g_chip_ident = vidioc_g_chip_ident, | ||
1583 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | 1585 | #ifdef CONFIG_VIDEO_V4L1_COMPAT |
1584 | .vidiocgmbuf = vidiocgmbuf, | 1586 | .vidiocgmbuf = vidiocgmbuf, |
1585 | #endif | 1587 | #endif |