github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Amlogic Drivers changes for v6.18:

Browse Source 
- device leak at probe in meson_sm
 - fix compile-test default for meson_sm
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmjJCIgACgkQd9zb2sjI
 SdH3Yg//bew1pt0igY75eZ3vuBZ4AwwDWrOveinJhWk2bOiYl+kX286D+Lz5lFE4
 B/8xbd/yOVvGAa71cpn8xCKFvnw8CjG76t/9ooHMPw1evPcsRhjFC8uZqtLU7zMB
 hUdmgMs1Ma7yes00fdsRlK1oSc3kE6IDa4sKnKtO33ej5FwrY2jvV4T87DCTBUYL
 kb3IAMFJ41KV29lky9AVS8tvCSQA1ZPo6JJlg3fksgpeV/+NqySXECKv+CzbPWmT
 fz3g4QAc36RDQq4T+dZtcEewA00xb2vMsO7stOT5n4EtrlYn3qwP3injySfPMT/o
 BIABl/ZAUHYFf9YlIk+GxXoMYbRiaEBK+SxV4f2DB9rLz+3qgy5kujw7bLlI1Zdl
 uKkg3r269k/yapCURbsd4k/Lt/2FP86wKhehM/nto4tG39KW/X1kIzzsYHoVdGYL
 nkhGBTnzlsfwQcVvWQwmNnLuMgb1iFyVnYJVXA88Cuc98pEFl+IDgeD0lX5eo6ET
 dPNKAOqf/ScOGUvpsWb0w9Y6XhWW+B/U8jH3L1ANB1cuoxqazavz3BTtIMg+8PdU
 vRJZS8B53+w0/23wLC1JiVI8QaBlhQMy2QiizYf2d2OcbCBfcle0R8S3FolkjY9G
 N7d7qfWczFk7ekHDpcLNmBkqOk74CfCvk85HCifMcGb8dNYczmo=
 =+Xpv
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmjTCnQACgkQmmx57+YA
 GNlRcBAAtrqu6wEYI6v16HCAGF8qEsG6ZoyayyDLhqezKWiq5JFpoL46GVGh7Nj6
 52SDwYCS2ttluoYb7qQyNzA6CX3jBDlc+C6zjodqscJBrwJVhJGUJdcoNDFqgs81
 h8nT+lqoaxEcKGW+Q6vDgm12TqbFAJpn7vK4/rEP830DL612424IXTHr6gLe4Q0b
 GJCGrvXf2S4CXru6Y7a1Z7nQhHDf+HEIlMUDlrpaKzuqzKxDGbWKYQLjATV5QQSQ
 /6QBIArD/N+slnqkr+0ujWTmi50HSDbW+Hz/48OUQibjak+riBssRyot0vBSV//2
 ZCDicYMPFn9797knqbvJrPzZwfpAovH25v8EAb/nJ+Bhwi57NlcZIS3PGrV1R7RO
 bB1wr4mY36OOb9i7mY58tpUJNB0Z8LiarL5ooGjcTBw87p4IqyqVD1QPhr80xZhn
 wrn3ASHOTkpWMMSl2ny+V9B4kdbVIvP7phnSjDpMXZtVxwkn409zqn8SDmdDjQW/
 Xynd0IQdz9Y2bPjoxg9w4UQcfJpM646g/3fU/uiuI8PVH/S6N2dgF3ib+TW3wFbI
 mZYoxEJEzsN8ESqzUt7HpubRETQS5dEAUDejCID6uwcl3f58ml46TA4xzw8NDZ0S
 GFtV8+6544PTiVyvClzcwia97+TmJsPjn7wu11mSG6jDYhiqvg8=
 =JtYp
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-drivers-for-v6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers

Amlogic Drivers changes for v6.18:
- device leak at probe in meson_sm
- fix compile-test default for meson_sm

* tag 'amlogic-drivers-for-v6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  firmware: firmware: meson-sm: fix compile-test default
  firmware: meson_sm: fix device leak at probe

Link: https://lore.kernel.org/r/003cb467-531d-4a8d-a97f-19d59154132f@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-09-23 23:00:33 +02:00
commit 833bb53d5e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/firmware/meson/Kconfig
View File

@ -5,7 +5,7 @@
config MESON_SM
tristate "Amlogic Secure Monitor driver"
depends on ARCH_MESON || COMPILE_TEST
default y
default ARCH_MESON
depends on ARM64_4K_PAGES
help
Say y here to enable the Amlogic secure monitor driver

7
drivers/firmware/meson/meson_sm.c
View File

@ -232,11 +232,16 @@ EXPORT_SYMBOL(meson_sm_call_write);
struct meson_sm_firmware *meson_sm_get(struct device_node *sm_node)
{
struct platform_device *pdev = of_find_device_by_node(sm_node);
struct meson_sm_firmware *fw;
if (!pdev)
return NULL;
return platform_get_drvdata(pdev);
fw = platform_get_drvdata(pdev);
put_device(&pdev->dev);
return fw;
}
EXPORT_SYMBOL_GPL(meson_sm_get);