mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
[media] radio: set vfl_dir correctly to fix modulator regression
The vfl_dir field should be set to indicate whether a device can receive data, output data or can do both. This is used to let the v4l core know which ioctls should be accepted and which can be refused. Unfortunately, when this field was added the radio modulator drivers were not updated: radio modulators transmit and so vfl_dir should be set to VFL_DIR_TX (or VFL_DIR_M2M in the special case of wl128x). Because of this omission it is not possible to call g/s_modulator for these drivers, which effectively renders them useless. This patch sets the correct vfl_dir value for these drivers, correcting this bug. Thanks to Paul Grinberg for bringing this to my attention. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
68d6f84ba0
commit
ce4a3d5288
4 changed files with 13 additions and 0 deletions
|
@ -374,6 +374,7 @@ static int usb_keene_probe(struct usb_interface *intf,
|
|||
radio->vdev.ioctl_ops = &usb_keene_ioctl_ops;
|
||||
radio->vdev.lock = &radio->lock;
|
||||
radio->vdev.release = video_device_release_empty;
|
||||
radio->vdev.vfl_dir = VFL_DIR_TX;
|
||||
|
||||
radio->usbdev = interface_to_usbdev(intf);
|
||||
radio->intf = intf;
|
||||
|
|
|
@ -250,6 +250,7 @@ static struct video_device radio_si4713_vdev_template = {
|
|||
.name = "radio-si4713",
|
||||
.release = video_device_release,
|
||||
.ioctl_ops = &radio_si4713_ioctl_ops,
|
||||
.vfl_dir = VFL_DIR_TX,
|
||||
};
|
||||
|
||||
/* Platform driver interface */
|
||||
|
|
|
@ -1971,6 +1971,7 @@ static struct video_device wl1273_viddev_template = {
|
|||
.ioctl_ops = &wl1273_ioctl_ops,
|
||||
.name = WL1273_FM_DRIVER_NAME,
|
||||
.release = wl1273_vdev_release,
|
||||
.vfl_dir = VFL_DIR_TX,
|
||||
};
|
||||
|
||||
static int wl1273_fm_radio_remove(struct platform_device *pdev)
|
||||
|
|
|
@ -518,6 +518,16 @@ static struct video_device fm_viddev_template = {
|
|||
.ioctl_ops = &fm_drv_ioctl_ops,
|
||||
.name = FM_DRV_NAME,
|
||||
.release = video_device_release,
|
||||
/*
|
||||
* To ensure both the tuner and modulator ioctls are accessible we
|
||||
* set the vfl_dir to M2M to indicate this.
|
||||
*
|
||||
* It is not really a mem2mem device of course, but it can both receive
|
||||
* and transmit using the same radio device. It's the only radio driver
|
||||
* that does this and it should really be split in two radio devices,
|
||||
* but that would affect applications using this driver.
|
||||
*/
|
||||
.vfl_dir = VFL_DIR_M2M,
|
||||
};
|
||||
|
||||
int fm_v4l2_init_video_device(struct fmdev *fmdev, int radio_nr)
|
||||
|
|
Loading…
Reference in a new issue