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 tag 'media/v5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:

- a regression fix for si2157

- a Kconfig dependency fix for imx-mipi-csis

- fix the rockchip/rga driver probing logic

* tag 'media/v5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: si2157: unknown chip version Si2147-A30 ROM 0x50
media: platform: imx-mipi-csis: Add dependency on VIDEO_DEV
media: rockchip/rga: do proper error checking in probe

Linus Torvalds 7083b89e 932aba1e

+13 -12
+1
drivers/media/platform/nxp/Kconfig
··· 7 7 config VIDEO_IMX_MIPI_CSIS 8 8 tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models" 9 9 depends on ARCH_MXC || COMPILE_TEST 10 + depends on VIDEO_DEV 10 11 select MEDIA_CONTROLLER 11 12 select V4L2_FWNODE 12 13 select VIDEO_V4L2_SUBDEV_API
+1 -1
drivers/media/platform/rockchip/rga/rga.c
··· 892 892 } 893 893 rga->dst_mmu_pages = 894 894 (unsigned int *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 3); 895 - if (rga->dst_mmu_pages) { 895 + if (!rga->dst_mmu_pages) { 896 896 ret = -ENOMEM; 897 897 goto free_src_pages; 898 898 }
+11 -11
drivers/media/tuners/si2157.c
··· 77 77 } 78 78 79 79 static const struct si2157_tuner_info si2157_tuners[] = { 80 - { SI2141, false, 0x60, SI2141_60_FIRMWARE, SI2141_A10_FIRMWARE }, 81 - { SI2141, false, 0x61, SI2141_61_FIRMWARE, SI2141_A10_FIRMWARE }, 82 - { SI2146, false, 0x11, SI2146_11_FIRMWARE, NULL }, 83 - { SI2147, false, 0x50, SI2147_50_FIRMWARE, NULL }, 84 - { SI2148, true, 0x32, SI2148_32_FIRMWARE, SI2158_A20_FIRMWARE }, 85 - { SI2148, true, 0x33, SI2148_33_FIRMWARE, SI2158_A20_FIRMWARE }, 86 - { SI2157, false, 0x50, SI2157_50_FIRMWARE, SI2157_A30_FIRMWARE }, 87 - { SI2158, false, 0x50, SI2158_50_FIRMWARE, SI2158_A20_FIRMWARE }, 88 - { SI2158, false, 0x51, SI2158_51_FIRMWARE, SI2158_A20_FIRMWARE }, 89 - { SI2177, false, 0x50, SI2177_50_FIRMWARE, SI2157_A30_FIRMWARE }, 80 + { SI2141, 0x60, false, SI2141_60_FIRMWARE, SI2141_A10_FIRMWARE }, 81 + { SI2141, 0x61, false, SI2141_61_FIRMWARE, SI2141_A10_FIRMWARE }, 82 + { SI2146, 0x11, false, SI2146_11_FIRMWARE, NULL }, 83 + { SI2147, 0x50, false, SI2147_50_FIRMWARE, NULL }, 84 + { SI2148, 0x32, true, SI2148_32_FIRMWARE, SI2158_A20_FIRMWARE }, 85 + { SI2148, 0x33, true, SI2148_33_FIRMWARE, SI2158_A20_FIRMWARE }, 86 + { SI2157, 0x50, false, SI2157_50_FIRMWARE, SI2157_A30_FIRMWARE }, 87 + { SI2158, 0x50, false, SI2158_50_FIRMWARE, SI2158_A20_FIRMWARE }, 88 + { SI2158, 0x51, false, SI2158_51_FIRMWARE, SI2158_A20_FIRMWARE }, 89 + { SI2177, 0x50, false, SI2177_50_FIRMWARE, SI2157_A30_FIRMWARE }, 90 90 }; 91 91 92 92 static int si2157_load_firmware(struct dvb_frontend *fe, ··· 178 178 } 179 179 } 180 180 181 - if (!fw_name && !fw_alt_name) { 181 + if (required && !fw_name && !fw_alt_name) { 182 182 dev_err(&client->dev, 183 183 "unknown chip version Si21%d-%c%c%c ROM 0x%02x\n", 184 184 part_id, cmd.args[1], cmd.args[3], cmd.args[4], rom_id);