tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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 <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab 32737810 467548aa

+7 -3
+3
drivers/media/radio/si470x/radio-si470x-common.c
··· 151 151 .index = 0, 152 152 .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO | 153 153 V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO | 154 + V4L2_TUNER_CAP_FREQ_BANDS | 154 155 V4L2_TUNER_CAP_HWSEEK_BOUNDED | 155 156 V4L2_TUNER_CAP_HWSEEK_WRAP, 156 157 .rangelow = 87500 * 16, ··· 163 162 .index = 1, 164 163 .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO | 165 164 V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO | 165 + V4L2_TUNER_CAP_FREQ_BANDS | 166 166 V4L2_TUNER_CAP_HWSEEK_BOUNDED | 167 167 V4L2_TUNER_CAP_HWSEEK_WRAP, 168 168 .rangelow = 76000 * 16, ··· 175 173 .index = 2, 176 174 .capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO | 177 175 V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO | 176 + V4L2_TUNER_CAP_FREQ_BANDS | 178 177 V4L2_TUNER_CAP_HWSEEK_BOUNDED | 179 178 V4L2_TUNER_CAP_HWSEEK_WRAP, 180 179 .rangelow = 76000 * 16,
+3 -2
drivers/media/radio/si470x/radio-si470x-i2c.c
··· 225 225 { 226 226 strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver)); 227 227 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; 230 231 231 232 return 0; 232 233 }
+1 -1
drivers/media/radio/si470x/radio-si470x-usb.c
··· 531 531 strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card)); 532 532 usb_make_path(radio->usbdev, capability->bus_info, 533 533 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 | 535 535 V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE; 536 536 capability->capabilities = capability->device_caps | V4L2_CAP_DEVICE_CAPS; 537 537 return 0;