Reset controller fixes for v6.17

* Fix an OF node reference leak in the EyeQ reset controller driver.
 -----BEGIN PGP SIGNATURE-----
 
 iI0EABYIADUWIQRRO6F6WdpH1R0vGibVhaclGDdiwAUCaLmwoRcccC56YWJlbEBw
 ZW5ndXRyb25peC5kZQAKCRDVhaclGDdiwPp4AP4xxeCKzQAIxjZalSNQd9BsWP+n
 bu/S1a0ciZv9XvkZ7gD/TbpSnvgZgnSh79qLosvOg/bBa7rWMxZKaVH7FiNbRgc=
 =P8IK
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmjEQtAACgkQmmx57+YA
 GNljpg//fkFtBYPCnp1vxYs4SrAuBHrsi7S3IeQBV3PEjOLwTbz3rR4urdQ1uJMR
 ffZpCavNHlyNMvxUpJnUz3saFJm91AH4Kaz8dqPbFm7Ea5qDy+Sng7RaV/YQoRRi
 dvrTTQuOm9AXwLNCHknFQ2eefVAtuqix0+T0y+RjygxnFAMoy5i0XCDfEPRvKRaV
 D80rCFW5Dg5VGFcjD9mwbqmsdSB3/SYOwe3KVjyW8PAwjxR90pOM6zOuu43jAjrc
 FiWyyP1924yCafzAD1B43vn+psRGHytcWtY0l4wbMNh/JQbr72zcpGFFss82ORtG
 Uj+yOXzxyBdcJoeRdcF3KbL5SyLi4T879j9nsWDOiqL8o0U0xbNy6PNkaWyB1LB2
 iVpK943AdFUObleikpMxQSAAbiOWfrdZbHAvjgFRn0gj5OO+TaPFAHcbrOOcr4yO
 y3/PZMF5lsvZxZo0ExYNd+yH50FL/JyMvIr0ENkz8WKSDJmJz6h59cuKnS1wniJc
 8mUrSSq92bfhZIL91Gi6OHq/R5oAaUyelBw3U4j7VqYOj1xjGma/hVvo7VSizg2P
 OKIGpkILznd2D1gp91P2rCM2Qsf2lFg6P8B+7dA/VhZPJZ9esJaP0XnfdmCGSzmI
 mcK9oax6snQ4GSWqYO8Jr1RHX9IwNY4ZoRiTmcfAjdJtH5krObs=
 =aPgd
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2025-09-12 17:57:03 +02:00
commit bab62f5bdc

View File

@ -410,6 +410,13 @@ static int eqr_of_xlate_twocells(struct reset_controller_dev *rcdev,
return eqr_of_xlate_internal(rcdev, reset_spec->args[0], reset_spec->args[1]);
}
static void eqr_of_node_put(void *_dev)
{
struct device *dev = _dev;
of_node_put(dev->of_node);
}
static int eqr_probe(struct auxiliary_device *adev,
const struct auxiliary_device_id *id)
{
@ -428,6 +435,10 @@ static int eqr_probe(struct auxiliary_device *adev,
if (!dev->of_node)
return -ENODEV;
ret = devm_add_action_or_reset(dev, eqr_of_node_put, dev);
if (ret)
return ret;
/*
* Using our newfound OF node, we can get match data. We cannot use
* device_get_match_data() because it does not match reused OF nodes.