Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32737810 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 467548aa

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -151,6 +151,7 @@ static const struct v4l2_frequency_band bands[] = { 
		.index = 0,

		.index = 0,

		.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

		.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |

			    V4L2_TUNER_CAP_FREQ_BANDS |

			    V4L2_TUNER_CAP_HWSEEK_BOUNDED |

			    V4L2_TUNER_CAP_HWSEEK_BOUNDED |

			    V4L2_TUNER_CAP_HWSEEK_WRAP,

			    V4L2_TUNER_CAP_HWSEEK_WRAP,

		.rangelow   =  87500 * 16,

		.rangelow   =  87500 * 16,
@@ -162,6 +163,7 @@ static const struct v4l2_frequency_band bands[] = { 
		.index = 1,

		.index = 1,

		.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

		.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |

			    V4L2_TUNER_CAP_FREQ_BANDS |

			    V4L2_TUNER_CAP_HWSEEK_BOUNDED |

			    V4L2_TUNER_CAP_HWSEEK_BOUNDED |

			    V4L2_TUNER_CAP_HWSEEK_WRAP,

			    V4L2_TUNER_CAP_HWSEEK_WRAP,

		.rangelow   =  76000 * 16,

		.rangelow   =  76000 * 16,
@@ -173,6 +175,7 @@ static const struct v4l2_frequency_band bands[] = { 
		.index = 2,

		.index = 2,

		.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

		.capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO |

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |

			    V4L2_TUNER_CAP_RDS | V4L2_TUNER_CAP_RDS_BLOCK_IO |

			    V4L2_TUNER_CAP_FREQ_BANDS |

			    V4L2_TUNER_CAP_HWSEEK_BOUNDED |

			    V4L2_TUNER_CAP_HWSEEK_BOUNDED |

			    V4L2_TUNER_CAP_HWSEEK_WRAP,

			    V4L2_TUNER_CAP_HWSEEK_WRAP,

		.rangelow   =  76000 * 16,

		.rangelow   =  76000 * 16,

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -225,8 +225,9 @@ int si470x_vidioc_querycap(struct file *file, void *priv, 
{

{

	strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));

	strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));

	strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));

	strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));

	capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |

	capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_READWRITE |

		V4L2_CAP_TUNER | V4L2_CAP_RADIO;

		V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE;

	capability->capabilities = capability->device_caps | V4L2_CAP_DEVICE_CAPS;





	return 0;

	return 0;

}

}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -531,7 +531,7 @@ int si470x_vidioc_querycap(struct file *file, void *priv, 
	strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));

	strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));

	usb_make_path(radio->usbdev, capability->bus_info,

	usb_make_path(radio->usbdev, capability->bus_info,

			sizeof(capability->bus_info));

			sizeof(capability->bus_info));

	capability->device_caps = V4L2_CAP_HW_FREQ_SEEK |

	capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_READWRITE |

		V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE;

		V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE;

	capability->capabilities = capability->device_caps | V4L2_CAP_DEVICE_CAPS;

	capability->capabilities = capability->device_caps | V4L2_CAP_DEVICE_CAPS;

	return 0;

	return 0;