hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media updates for v5.3-rc1 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+QmuaPwR3wnBdVwACF8+vY7k4RUFAl1NO1EACgkQCF8+vY7k
 4RUrPQ/+JAenDJNA8fHSJMr1ANrn8Dmav0GxhMdsEfS11H/VF8UmlEqXdzWwoCe8
 XizEC1RlqHFQjqet2TShOxN2zl2yTSOKWbVuD4UIRF5zcYwmxbpAfVyDUnblyQq7
 jpLIsgQ0aVbeF7OzMoNfpFk8upNrTDkwhpjJq3jPF7OzfXO9viVqWd14YrGWwX5x
 RwwwkxQeoJTRG5bi9UKlJ/+s0jws0OU/xhsRVmC+KRx8fAwiXJrD759p2pSt5QWI
 hnN30fdA22/nGZpeS2A85OwPggGuK5ub+bXyP+8+VXhjy+rAD4vgs1ZFAgi2GU7u
 G3xjSJe/VanCDhCvMmMg/4zaaW+JVHKQMVbO2MVNiKMKyWPzhRROp+2AI0Sao7TK
 TChCuFqhfhsUzL4IOrRrd4fSx+TUeAMP9P0oS1JW5YWa8ij5EZp8DP4wPMgXFAZQ
 MqGwxFbS8tEHp8juJof2U16cM/v3tm33fhfBHfHsR0vgUHbToSS13MQ8plAaTJn6
 WB9rjqsUtbOxNv8UPg1+wePl88qrVqt8FElbt1sVn9bRaQiRmeSs+GJnBtM+n94D
 YmvyNfkuragUH66PbAMzNYf9GV2xoZCGT1kFZInbfgzl+NdxBb9a3e2dGPNXV+7z
 YLhrM0dpmjGXulnG3hYYysI1MJkWoaZZkaZPKGbt+YSIKjkYbyE=
 =Ry81
 -----END PGP SIGNATURE-----

Merge tag 'media/v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fix from Mauro Carvalho Chehab:
 "A fix at the vivid CEC support"

* tag 'media/v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: vivid: fix missing cec adapter name
This commit is contained in:
Linus Torvalds 2019-08-09 09:19:53 -07:00
parent 0acf5676dc 92f5b0313e
commit 6c02b6300f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/vivid/vivid-core.c
View File

@ -1099,6 +1099,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
/* start creating the vb2 queues */
if (dev->has_vid_cap) {
snprintf(dev->vid_cap_dev.name, sizeof(dev->vid_cap_dev.name),
"vivid-%03d-vid-cap", inst);
/* initialize vid_cap queue */
q = &dev->vb_vid_cap_q;
q->type = dev->multiplanar ? V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :
@ -1122,6 +1124,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
}
if (dev->has_vid_out) {
snprintf(dev->vid_out_dev.name, sizeof(dev->vid_out_dev.name),
"vivid-%03d-vid-out", inst);
/* initialize vid_out queue */
q = &dev->vb_vid_out_q;
q->type = dev->multiplanar ? V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE :
@ -1265,8 +1269,6 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
/* finally start creating the device nodes */
if (dev->has_vid_cap) {
vfd = &dev->vid_cap_dev;
snprintf(vfd->name, sizeof(vfd->name),
"vivid-%03d-vid-cap", inst);
vfd->fops = &vivid_fops;
vfd->ioctl_ops = &vivid_ioctl_ops;
vfd->device_caps = dev->vid_cap_caps;
@ -1312,8 +1314,6 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
if (dev->has_vid_out) {
vfd = &dev->vid_out_dev;
snprintf(vfd->name, sizeof(vfd->name),
"vivid-%03d-vid-out", inst);
vfd->vfl_dir = VFL_DIR_TX;
vfd->fops = &vivid_fops;
vfd->ioctl_ops = &vivid_ioctl_ops;