Skip to content

Commit bab62f5

Browse files
committed
Merge tag 'reset-fixes-for-v6.17' of https://git.pengutronix.de/git/pza/linux into arm/fixes
Reset controller fixes for v6.17 * Fix an OF node reference leak in the EyeQ reset controller driver. * tag 'reset-fixes-for-v6.17' of https://git.pengutronix.de/git/pza/linux: reset: eyeq: fix OF node leak Link: https://lore.kernel.org/r/20250904153345.2374313-1-p.zabel@pengutronix.de Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f1a43af + 9a52827 commit bab62f5

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

drivers/reset/reset-eyeq.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,13 @@ static int eqr_of_xlate_twocells(struct reset_controller_dev *rcdev,
410410
return eqr_of_xlate_internal(rcdev, reset_spec->args[0], reset_spec->args[1]);
411411
}
412412

413+
static void eqr_of_node_put(void *_dev)
414+
{
415+
struct device *dev = _dev;
416+
417+
of_node_put(dev->of_node);
418+
}
419+
413420
static int eqr_probe(struct auxiliary_device *adev,
414421
const struct auxiliary_device_id *id)
415422
{
@@ -428,6 +435,10 @@ static int eqr_probe(struct auxiliary_device *adev,
428435
if (!dev->of_node)
429436
return -ENODEV;
430437

438+
ret = devm_add_action_or_reset(dev, eqr_of_node_put, dev);
439+
if (ret)
440+
return ret;
441+
431442
/*
432443
* Using our newfound OF node, we can get match data. We cannot use
433444
* device_get_match_data() because it does not match reused OF nodes.

0 commit comments

Comments
 (0)