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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
"For a regression fix on a few radio drivers that were preventing radio
TX to work on those devices"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] radio: set vfl_dir correctly to fix modulator regression

Linus Torvalds 1589a3e7 0f632118

+13
+1
drivers/media/radio/radio-keene.c
··· 374 374 radio->vdev.ioctl_ops = &usb_keene_ioctl_ops; 375 375 radio->vdev.lock = &radio->lock; 376 376 radio->vdev.release = video_device_release_empty; 377 + radio->vdev.vfl_dir = VFL_DIR_TX; 377 378 378 379 radio->usbdev = interface_to_usbdev(intf); 379 380 radio->intf = intf;
+1
drivers/media/radio/radio-si4713.c
··· 250 250 .name = "radio-si4713", 251 251 .release = video_device_release, 252 252 .ioctl_ops = &radio_si4713_ioctl_ops, 253 + .vfl_dir = VFL_DIR_TX, 253 254 }; 254 255 255 256 /* Platform driver interface */
+1
drivers/media/radio/radio-wl1273.c
··· 1971 1971 .ioctl_ops = &wl1273_ioctl_ops, 1972 1972 .name = WL1273_FM_DRIVER_NAME, 1973 1973 .release = wl1273_vdev_release, 1974 + .vfl_dir = VFL_DIR_TX, 1974 1975 }; 1975 1976 1976 1977 static int wl1273_fm_radio_remove(struct platform_device *pdev)
+10
drivers/media/radio/wl128x/fmdrv_v4l2.c
··· 518 518 .ioctl_ops = &fm_drv_ioctl_ops, 519 519 .name = FM_DRV_NAME, 520 520 .release = video_device_release, 521 + /* 522 + * To ensure both the tuner and modulator ioctls are accessible we 523 + * set the vfl_dir to M2M to indicate this. 524 + * 525 + * It is not really a mem2mem device of course, but it can both receive 526 + * and transmit using the same radio device. It's the only radio driver 527 + * that does this and it should really be split in two radio devices, 528 + * but that would affect applications using this driver. 529 + */ 530 + .vfl_dir = VFL_DIR_M2M, 521 531 }; 522 532 523 533 int fm_v4l2_init_video_device(struct fmdev *fmdev, int radio_nr)