Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

media fixes for v5.18-rc2

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+QmuaPwR3wnBdVwACF8+vY7k4RUFAmJUnrwACgkQCF8+vY7k
 4RUfkQ/9H6OBd3Tyw2X2vRV/EsYovO4WvHtWI4W34JAfaFAdoJG4I5huFsr3GODC
 F4zzcw9EW5zfXbHW8Yu8ydBiUn13ixsrvaEjF378nYKl8NlGlFKBWw8WhZHsdXO8
 0guBh45TVOsUC8eFa6RSr7VbHZN+O7oApfrBN026aTY7nZv5GAdOuIUwhB0EkEPu
 Cy8sDs2M5K3sGSW+8xrquXmjLdYvHjZOYiE+h3gl/MAsa0V4xfJp5R2YUMk5IWGS
 /xeB995l4hBO2w8lqbYGFSwAohJcpFlTP9l9vIpDsLQ3WLur0CaQzptorCVCLZWP
 5/SQDZJIGwhoewkM6DKOAD3tIpq/J92ZmC40Ip62+47Pz3pWFdoemk4R7lkR9Bki
 pvUYtWuJoa3Yepb6nifrzATy+Lm5HUDajD10CGIAlf7dkE8uBgmyXkewB7foeoGX
 UwmT4fr+t1zDimgATDCwqAxrlAu6he1bSXBoDPnm90Ep07ch+giIn2icencLzite
 yLuH4AyUIMSktiPLDtbCSTxezKn/p0sO6urSBc4vIrje+b4ViaIHhO5KBqsA6OVD
 54bIY6/dR2PsonGlCESUWrv2dde7JEADCpPLRPanGWcLHnmptRPWhhZswSbeZuoY
 ROw0mGx8ThOQOKv05/aNukRWAMCV1EDlV3vac0bKTrrYLJuWxOs=
 =gSBA
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2022-04-12 14:08:43 -10:00
commit 7083b89ef3
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/media/platform/nxp/Kconfig
View file

@ -7,6 +7,7 @@ comment "NXP media platform drivers"
config VIDEO_IMX_MIPI_CSIS
tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
depends on ARCH_MXC || COMPILE_TEST
depends on VIDEO_DEV
select MEDIA_CONTROLLER
select V4L2_FWNODE
select VIDEO_V4L2_SUBDEV_API

2
drivers/media/platform/rockchip/rga/rga.c
View file

@ -892,7 +892,7 @@ static int rga_probe(struct platform_device *pdev)
}
rga->dst_mmu_pages =
(unsigned int *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 3);
if (rga->dst_mmu_pages) {
if (!rga->dst_mmu_pages) {
ret = -ENOMEM;
goto free_src_pages;
}

22
drivers/media/tuners/si2157.c
View file

@ -77,16 +77,16 @@ err_mutex_unlock:
}
static const struct si2157_tuner_info si2157_tuners[] = {
{ SI2141, false, 0x60, SI2141_60_FIRMWARE, SI2141_A10_FIRMWARE },
{ SI2141, false, 0x61, SI2141_61_FIRMWARE, SI2141_A10_FIRMWARE },
{ SI2146, false, 0x11, SI2146_11_FIRMWARE, NULL },
{ SI2147, false, 0x50, SI2147_50_FIRMWARE, NULL },
{ SI2148, true, 0x32, SI2148_32_FIRMWARE, SI2158_A20_FIRMWARE },
{ SI2148, true, 0x33, SI2148_33_FIRMWARE, SI2158_A20_FIRMWARE },
{ SI2157, false, 0x50, SI2157_50_FIRMWARE, SI2157_A30_FIRMWARE },
{ SI2158, false, 0x50, SI2158_50_FIRMWARE, SI2158_A20_FIRMWARE },
{ SI2158, false, 0x51, SI2158_51_FIRMWARE, SI2158_A20_FIRMWARE },
{ SI2177, false, 0x50, SI2177_50_FIRMWARE, SI2157_A30_FIRMWARE },
{ SI2141, 0x60, false, SI2141_60_FIRMWARE, SI2141_A10_FIRMWARE },
{ SI2141, 0x61, false, SI2141_61_FIRMWARE, SI2141_A10_FIRMWARE },
{ SI2146, 0x11, false, SI2146_11_FIRMWARE, NULL },
{ SI2147, 0x50, false, SI2147_50_FIRMWARE, NULL },
{ SI2148, 0x32, true, SI2148_32_FIRMWARE, SI2158_A20_FIRMWARE },
{ SI2148, 0x33, true, SI2148_33_FIRMWARE, SI2158_A20_FIRMWARE },
{ SI2157, 0x50, false, SI2157_50_FIRMWARE, SI2157_A30_FIRMWARE },
{ SI2158, 0x50, false, SI2158_50_FIRMWARE, SI2158_A20_FIRMWARE },
{ SI2158, 0x51, false, SI2158_51_FIRMWARE, SI2158_A20_FIRMWARE },
{ SI2177, 0x50, false, SI2177_50_FIRMWARE, SI2157_A30_FIRMWARE },
};
static int si2157_load_firmware(struct dvb_frontend *fe,
@ -178,7 +178,7 @@ static int si2157_find_and_load_firmware(struct dvb_frontend *fe)
}
}
if (!fw_name && !fw_alt_name) {
if (required && !fw_name && !fw_alt_name) {
dev_err(&client->dev,
"unknown chip version Si21%d-%c%c%c ROM 0x%02x\n",
part_id, cmd.args[1], cmd.args[3], cmd.args[4], rom_id);