diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-11-24 04:37:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-02 08:30:55 -0500 |
commit | 7027c448d2408827ce6f952a161fcb6254fb2234 (patch) | |
tree | 883e42306448d1c945e14a11b11ef97530d704e5 /drivers/media/radio | |
parent | 2eb3b1adcb9309245785ebbddf8022ec57746bc9 (diff) |
[media] media/radio: fix querycap
Querycap should set the device_caps field.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r-- | drivers/media/radio/radio-wl1273.c | 4 | ||||
-rw-r--r-- | drivers/media/radio/wl128x/fmdrv_v4l2.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index 9cf6731fb816..284f789265e0 100644 --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c | |||
@@ -1279,10 +1279,12 @@ static int wl1273_fm_vidioc_querycap(struct file *file, void *priv, | |||
1279 | strlcpy(capability->bus_info, radio->bus_type, | 1279 | strlcpy(capability->bus_info, radio->bus_type, |
1280 | sizeof(capability->bus_info)); | 1280 | sizeof(capability->bus_info)); |
1281 | 1281 | ||
1282 | capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | | 1282 | capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | |
1283 | V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_AUDIO | | 1283 | V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_AUDIO | |
1284 | V4L2_CAP_RDS_CAPTURE | V4L2_CAP_MODULATOR | | 1284 | V4L2_CAP_RDS_CAPTURE | V4L2_CAP_MODULATOR | |
1285 | V4L2_CAP_RDS_OUTPUT; | 1285 | V4L2_CAP_RDS_OUTPUT; |
1286 | capability->capabilities = capability->device_caps | | ||
1287 | V4L2_CAP_DEVICE_CAPS; | ||
1286 | 1288 | ||
1287 | return 0; | 1289 | return 0; |
1288 | } | 1290 | } |
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c index b55012c11842..a5bd3f674bbd 100644 --- a/drivers/media/radio/wl128x/fmdrv_v4l2.c +++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c | |||
@@ -198,10 +198,12 @@ static int fm_v4l2_vidioc_querycap(struct file *file, void *priv, | |||
198 | strlcpy(capability->card, FM_DRV_CARD_SHORT_NAME, | 198 | strlcpy(capability->card, FM_DRV_CARD_SHORT_NAME, |
199 | sizeof(capability->card)); | 199 | sizeof(capability->card)); |
200 | sprintf(capability->bus_info, "UART"); | 200 | sprintf(capability->bus_info, "UART"); |
201 | capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER | | 201 | capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER | |
202 | V4L2_CAP_RADIO | V4L2_CAP_MODULATOR | | 202 | V4L2_CAP_RADIO | V4L2_CAP_MODULATOR | |
203 | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | | 203 | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | |
204 | V4L2_CAP_RDS_CAPTURE; | 204 | V4L2_CAP_RDS_CAPTURE; |
205 | capability->capabilities = capability->device_caps | | ||
206 | V4L2_CAP_DEVICE_CAPS; | ||
205 | 207 | ||
206 | return 0; | 208 | return 0; |
207 | } | 209 | } |