diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-09 09:38:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-24 12:40:25 -0300 |
| commit | 4d217b83fe315776d54b11d752fb09c5fb0de2da (patch) | |
| tree | 51a695d608f0a7694b81da378a54c36f81bce1fc /drivers/staging/media/go7007/go7007-v4l2.c | |
| parent | c046981f1aa0e1e1345e6ec43f6bea611e575351 (diff) | |
| download | op-kernel-dev-4d217b83fe315776d54b11d752fb09c5fb0de2da.zip op-kernel-dev-4d217b83fe315776d54b11d752fb09c5fb0de2da.tar.gz | |
[media] go7007: go7007: add device_caps and bus_info support to querycap
And don't set the version field, the core does that for you.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media/go7007/go7007-v4l2.c')
| -rw-r--r-- | drivers/staging/media/go7007/go7007-v4l2.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c index a730781..e9196bb 100644 --- a/drivers/staging/media/go7007/go7007-v4l2.c +++ b/drivers/staging/media/go7007/go7007-v4l2.c @@ -602,19 +602,15 @@ static int vidioc_querycap(struct file *file, void *priv, strlcpy(cap->driver, "go7007", sizeof(cap->driver)); strlcpy(cap->card, go->name, sizeof(cap->card)); -#if 0 - strlcpy(cap->bus_info, dev_name(&dev->udev->dev), sizeof(cap->bus_info)); -#endif - - cap->version = KERNEL_VERSION(0, 9, 8); + strlcpy(cap->bus_info, go->bus_info, sizeof(cap->bus_info)); cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; if (go->board_info->num_aud_inputs) cap->device_caps |= V4L2_CAP_AUDIO; if (go->board_info->flags & GO7007_BOARD_HAS_TUNER) - cap->capabilities |= V4L2_CAP_TUNER; - + cap->device_caps |= V4L2_CAP_TUNER; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; } |
