sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'apple-soc-drivers-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux into soc/drivers-late

Browse Source 
Apple SoC driver updates for 6.18

Two small fixes:
- mailbox: Stop leaking a reference to the mbox platform device during
  lookup
- sart: drop device reference after lookup since it's no longer used
  afterwards

Signed-off-by: Sven Peter <sven@kernel.org>

* tag 'apple-soc-drivers-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux:
  soc: apple: sart: drop device reference after lookup
  soc: apple: mailbox: fix device leak on lookup

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2025-11-27 22:58:57 +01:00
parent 16cc3988cc f95f3bcead
commit aa3294ff41
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/soc/apple/mailbox.c
View File

@@ -302,11 +302,18 @@ struct apple_mbox *apple_mbox_get(struct device *dev, int index)
return ERR_PTR(-EPROBE_DEFER); return ERR_PTR(-EPROBE_DEFER);
mbox = platform_get_drvdata(pdev); mbox = platform_get_drvdata(pdev);
if (!mbox) if (!mbox) {
return ERR_PTR(-EPROBE_DEFER); mbox = ERR_PTR(-EPROBE_DEFER);
goto out_put_pdev;
}
if (!device_link_add(dev, &pdev->dev, DL_FLAG_AUTOREMOVE_CONSUMER)) if (!device_link_add(dev, &pdev->dev, DL_FLAG_AUTOREMOVE_CONSUMER)) {
return ERR_PTR(-ENODEV); mbox = ERR_PTR(-ENODEV);
goto out_put_pdev;
}
out_put_pdev:
put_device(&pdev->dev);
return mbox; return mbox;
} }

13
drivers/soc/apple/sart.c
View File

@@ -214,17 +214,11 @@ static int apple_sart_probe(struct platform_device *pdev)
return 0; return 0;
} }
static void apple_sart_put_device(void *dev)
{
put_device(dev);
}
struct apple_sart *devm_apple_sart_get(struct device *dev) struct apple_sart *devm_apple_sart_get(struct device *dev)
{ {
struct device_node *sart_node; struct device_node *sart_node;
struct platform_device *sart_pdev; struct platform_device *sart_pdev;
struct apple_sart *sart; struct apple_sart *sart;
int ret;
sart_node = of_parse_phandle(dev->of_node, "apple,sart", 0); sart_node = of_parse_phandle(dev->of_node, "apple,sart", 0);
if (!sart_node) if (!sart_node)
@@ -242,14 +236,11 @@ struct apple_sart *devm_apple_sart_get(struct device *dev)
return ERR_PTR(-EPROBE_DEFER); return ERR_PTR(-EPROBE_DEFER);
} }
ret = devm_add_action_or_reset(dev, apple_sart_put_device,
&sart_pdev->dev);
if (ret)
return ERR_PTR(ret);
device_link_add(dev, &sart_pdev->dev, device_link_add(dev, &sart_pdev->dev,
DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE_SUPPLIER); DL_FLAG_PM_RUNTIME | DL_FLAG_AUTOREMOVE_SUPPLIER);
put_device(&sart_pdev->dev);
return sart; return sart;
} }
EXPORT_SYMBOL_GPL(devm_apple_sart_get); EXPORT_SYMBOL_GPL(devm_apple_sart_get);