diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-03 07:10:46 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 08:31:53 -0400 |
commit | 8f9acd236d9e6bd805b0dac2d0ca59dcd89edc99 (patch) | |
tree | 1e3c44a67b017fd88e585ce07c54e81d484135b7 | |
parent | fa915996fb4e06a90d15fa485742a77cd8c1642b (diff) |
[media] timblogiw: fix querycap
Don't set version (the core does that for you), fill in device_caps and
prefix bus_info with "platform:".
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/platform/timblogiw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c index 99861c631798..b557caf5b1a4 100644 --- a/drivers/media/platform/timblogiw.c +++ b/drivers/media/platform/timblogiw.c | |||
@@ -239,13 +239,12 @@ static int timblogiw_querycap(struct file *file, void *priv, | |||
239 | struct video_device *vdev = video_devdata(file); | 239 | struct video_device *vdev = video_devdata(file); |
240 | 240 | ||
241 | dev_dbg(&vdev->dev, "%s: Entry\n", __func__); | 241 | dev_dbg(&vdev->dev, "%s: Entry\n", __func__); |
242 | memset(cap, 0, sizeof(*cap)); | ||
243 | strncpy(cap->card, TIMBLOGIWIN_NAME, sizeof(cap->card)-1); | 242 | strncpy(cap->card, TIMBLOGIWIN_NAME, sizeof(cap->card)-1); |
244 | strncpy(cap->driver, DRIVER_NAME, sizeof(cap->driver) - 1); | 243 | strncpy(cap->driver, DRIVER_NAME, sizeof(cap->driver) - 1); |
245 | strlcpy(cap->bus_info, vdev->name, sizeof(cap->bus_info)); | 244 | snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", vdev->name); |
246 | cap->version = TIMBLOGIW_VERSION_CODE; | 245 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | |
247 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | | ||
248 | V4L2_CAP_READWRITE; | 246 | V4L2_CAP_READWRITE; |
247 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; | ||
249 | 248 | ||
250 | return 0; | 249 | return 0; |
251 | } | 250 | } |