Commit aae7a287 authored Sep 02, 2025 by Bartosz Golaszewski Committed by Linus Walleij Sep 08, 2025

pinctrl: keembay: release allocated memory in detach path

Unlike all the other allocations in this driver, the memory for storing
the pin function descriptions allocated with kcalloc() and later resized
with krealloc() is never freed. Use devres like elsewhere to handle
that. While at it - replace krealloc() with more suitable
devm_krealloc_array().

Note: the logic in this module is pretty convoluted and could probably
use some revisiting, we should probably be able to calculate the exact
amount of memory needed in advance or even skip the allocation
altogether and just add each function to the radix tree separately.

Tested-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent ea22f777

drivers/pinctrl/pinctrl-keembay.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1603,7 +1603,8 @@ static int keembay_build_functions(struct keembay_pinctrl *kpc)
		* being part of 8 (hw maximum) globally unique muxes.
		*/
		kpc->nfuncs = 0;
		keembay_funcs = kcalloc(kpc->npins * 8, sizeof(*keembay_funcs), GFP_KERNEL);
		keembay_funcs = devm_kcalloc(kpc->dev, kpc->npins * 8,
		sizeof(*keembay_funcs), GFP_KERNEL);
		if (!keembay_funcs)
		return -ENOMEM;

		@@ -1634,7 +1635,9 @@ static int keembay_build_functions(struct keembay_pinctrl *kpc)
		}

		/* Reallocate memory based on actual number of functions */
		new_funcs = krealloc(keembay_funcs, kpc->nfuncs * sizeof(*new_funcs), GFP_KERNEL);
		new_funcs = devm_krealloc_array(kpc->dev, keembay_funcs,
		kpc->nfuncs, sizeof(*new_funcs),
		GFP_KERNEL);
		if (!new_funcs) {
		kfree(keembay_funcs);
		return -ENOMEM;