Unverified Commit 833bb53d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-drivers-for-v6.18' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 72af4030 0454346d

drivers/firmware/meson/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/firmware/meson/meson_sm.c

+6 −1
Original line number Diff line number Diff line
@@ -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);