Re: [PATCH v2] mfd: cros_ec: Drop OF node reference in ec_device_probe()

From: Benson Leung

Date: Wed Nov 18 2026 - 12:20:46 EST


Hi Xiangwu,

Thanks for the follow up. Looks good.

On Wed, Nov 18, 2026 at 02:29:48PM +0800, Xiangwu Lai wrote:
> ec_device_probe() calls of_find_compatible_node() only to check
> whether a "google,cros-ec-ucsi" node exists in the device tree, but
> the reference held by the returned node is never dropped.
>
> Scope the lookup to the UCSI block and mark the node pointer with
> __free(device_node), so that the reference is released automatically
> when the block is left. Keeping the lookup inside the block also
> preserves the short-circuit evaluation of the original condition:
> the device tree is only walked when the EC_FEATURE_USB_PD,
> EC_FEATURE_UCSI_PPM and ACPI checks already passed, instead of on
> every probe of every cros_ec device.
>
> Fixes: 17f95281839d ("mfd: cros_ec: Don't add cros_ec_ucsi if it is defined in OF or ACPI")
> Suggested-by: Benson Leung <bleung@xxxxxxxxxxxx>
> Signed-off-by: Xiangwu Lai <laixiangwu@xxxxxxxxxxxxxxxxxxxx>

Reviewed-by: Benson Leung <bleung@xxxxxxxxxxxx>

> ---
>
> Changes in v2:
> - Scope the lookup to the UCSI block with __free(device_node) instead
> of a function-scope variable with a manual of_node_put() before the
> condition, per Benson's review: the v1 lookup ran on every probe
> (breaking the short-circuit evaluation) and the node pointer was
> tested after its reference had already been dropped.
>
> Link: https://lore.kernel.org/r/20261118013935.1573-1-laixiangwu@xxxxxxxxxxxxxxxxxxxx
>
> drivers/mfd/cros_ec_dev.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
> index 529a23b80..b8d363b7a 100644
> --- a/drivers/mfd/cros_ec_dev.c
> +++ b/drivers/mfd/cros_ec_dev.c
> @@ -271,14 +271,20 @@ static int ec_device_probe(struct platform_device *pdev)
> */
> if (cros_ec_check_features(ec, EC_FEATURE_USB_PD) &&
> cros_ec_check_features(ec, EC_FEATURE_UCSI_PPM) &&
> - !acpi_dev_found("GOOG0021") &&
> - !of_find_compatible_node(NULL, NULL, "google,cros-ec-ucsi")) {
> - retval = mfd_add_hotplug_devices(ec->dev,
> - cros_ec_ucsi_cells,
> - ARRAY_SIZE(cros_ec_ucsi_cells));
> + !acpi_dev_found("GOOG0021")) {
> + struct device_node *np __free(device_node) =
> + of_find_compatible_node(NULL, NULL, "google,cros-ec-ucsi");
>
> - if (retval)
> - dev_warn(ec->dev, "failed to add cros_ec_ucsi: %d\n", retval);
> + if (!np) {
> + retval = mfd_add_hotplug_devices(ec->dev,
> + cros_ec_ucsi_cells,
> + ARRAY_SIZE(cros_ec_ucsi_cells));
> +
> + if (retval)
> + dev_warn(ec->dev,
> + "failed to add cros_ec_ucsi: %d\n",
> + retval);
> + }
> }
>
> /*
> --
> 2.50.1.windows.1
>
>
>

Attachment: signature.asc
Description: PGP signature