diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-417.c | 1 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 | ||||
-rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c index f8f0e59cd583..d4327dab5a36 100644 --- a/drivers/media/video/cx231xx/cx231xx-417.c +++ b/drivers/media/video/cx231xx/cx231xx-417.c | |||
@@ -1686,7 +1686,6 @@ static struct v4l2_capability pvr_capability = { | |||
1686 | .capabilities = (V4L2_CAP_VIDEO_CAPTURE | | 1686 | .capabilities = (V4L2_CAP_VIDEO_CAPTURE | |
1687 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO | | 1687 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO | |
1688 | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE), | 1688 | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE), |
1689 | .reserved = {0, 0, 0, 0} | ||
1690 | }; | 1689 | }; |
1691 | static int vidioc_querycap(struct file *file, void *priv, | 1690 | static int vidioc_querycap(struct file *file, void *priv, |
1692 | struct v4l2_capability *cap) | 1691 | struct v4l2_capability *cap) |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 6d666174dbb4..e1111d968a3d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -96,7 +96,6 @@ static struct v4l2_capability pvr_capability ={ | |||
96 | .capabilities = (V4L2_CAP_VIDEO_CAPTURE | | 96 | .capabilities = (V4L2_CAP_VIDEO_CAPTURE | |
97 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO | | 97 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO | |
98 | V4L2_CAP_READWRITE), | 98 | V4L2_CAP_READWRITE), |
99 | .reserved = {0,0,0,0} | ||
100 | }; | 99 | }; |
101 | 100 | ||
102 | static struct v4l2_fmtdesc pvr_fmtdesc [] = { | 101 | static struct v4l2_fmtdesc pvr_fmtdesc [] = { |
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 3f623859a337..d0d7281e01e0 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
@@ -540,10 +540,12 @@ static long __video_do_ioctl(struct file *file, | |||
540 | if (!ret) | 540 | if (!ret) |
541 | dbgarg(cmd, "driver=%s, card=%s, bus=%s, " | 541 | dbgarg(cmd, "driver=%s, card=%s, bus=%s, " |
542 | "version=0x%08x, " | 542 | "version=0x%08x, " |
543 | "capabilities=0x%08x\n", | 543 | "capabilities=0x%08x, " |
544 | "device_caps=0x%08x\n", | ||
544 | cap->driver, cap->card, cap->bus_info, | 545 | cap->driver, cap->card, cap->bus_info, |
545 | cap->version, | 546 | cap->version, |
546 | cap->capabilities); | 547 | cap->capabilities, |
548 | cap->device_caps); | ||
547 | break; | 549 | break; |
548 | } | 550 | } |
549 | 551 | ||