Skip to content

Commit 3273781

Browse files
Hans VerkuilMauro Carvalho Chehab
authored andcommitted
[media] si470x: v4l2-compliance fixes
Just a few fixes for problems found after updating v4l2-compliance to check the frequency band enumeration. Note that the i2c driver doesn't fill in bus_info, but since I can't test that driver I've decided not to fix that. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 467548a commit 3273781

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

drivers/media/radio/si470x/radio-si470x-common.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ static const struct v4l2_frequency_band bands[] = {
151151
.index = 0,
152152
.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
153153
V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
154+
V4L2_TUNER_CAP_FREQ_BANDS |
154155
V4L2_TUNER_CAP_HWSEEK_BOUNDED |
155156
V4L2_TUNER_CAP_HWSEEK_WRAP,
156157
.rangelow = 87500 * 16,
@@ -162,6 +163,7 @@ static const struct v4l2_frequency_band bands[] = {
162163
.index = 1,
163164
.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
164165
V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
166+
V4L2_TUNER_CAP_FREQ_BANDS |
165167
V4L2_TUNER_CAP_HWSEEK_BOUNDED |
166168
V4L2_TUNER_CAP_HWSEEK_WRAP,
167169
.rangelow = 76000 * 16,
@@ -173,6 +175,7 @@ static const struct v4l2_frequency_band bands[] = {
173175
.index = 2,
174176
.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |
175177
V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |
178+
V4L2_TUNER_CAP_FREQ_BANDS |
176179
V4L2_TUNER_CAP_HWSEEK_BOUNDED |
177180
V4L2_TUNER_CAP_HWSEEK_WRAP,
178181
.rangelow = 76000 * 16,

drivers/media/radio/si470x/radio-si470x-i2c.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,9 @@ int si470x_vidioc_querycap(struct file *file, void *priv,
225225
{
226226
strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));
227227
strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));
228-
capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |
229-
V4L2_CAP_TUNER | V4L2_CAP_RADIO;
228+
capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_READWRITE |
229+
V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE;
230+
capability->capabilities = capability->device_caps | V4L2_CAP_DEVICE_CAPS;
230231

231232
return 0;
232233
}

drivers/media/radio/si470x/radio-si470x-usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ int si470x_vidioc_querycap(struct file *file, void *priv,
531531
strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));
532532
usb_make_path(radio->usbdev, capability->bus_info,
533533
sizeof(capability->bus_info));
534-
capability->device_caps = V4L2_CAP_HW_FREQ_SEEK |
534+
capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_READWRITE |
535535
V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE;
536536
capability->capabilities = capability->device_caps | V4L2_CAP_DEVICE_CAPS;
537537
return 0;

0 commit comments

Comments
 (0)