]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
pinctrl: mediatek: common-v1: Fix EINT breakage on older controllers
authorChen-Yu Tsai <wenst@chromium.org>
Tue, 15 Apr 2025 11:23:37 +0000 (19:23 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 17 Apr 2025 07:44:52 +0000 (09:44 +0200)
When EINT support for multiple addresses was introduced, the driver
library for the older generations (pinctrl-mtk-common) was not fixed
together. This resulted in invalid pointer accesses.

Fix up the filled in |struct mtk_eint| in pinctrl-mtk-common to match
what is now expected by the mtk-eint library.

Reported-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Tested-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Closes: https://lore.kernel.org/all/43nd5jxpk7b7fv46frqlfjnqfh5jlpqsemeoakqzd4wdi3df6y@w7ycd3k5ezvn/
Fixes: 3ef9f710efcb ("pinctrl: mediatek: Add EINT support for multiple addresses")
Cc: Hao Chang <ot_chhao.chang@mediatek.com>
Cc: Qingliang Li <qingliang.li@mediatek.com>
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/20250415112339.2385454-1-wenst@chromium.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/mediatek/pinctrl-mtk-common.c

index 91edb539925a49b4302866b9ac36f580cc189fb5..7585de11854becaca733efeafc2ce3164b1aa1ce 100644 (file)
@@ -1015,7 +1015,13 @@ static int mtk_eint_init(struct mtk_pinctrl *pctl, struct platform_device *pdev)
        if (!pctl->eint)
                return -ENOMEM;
 
-       pctl->eint->base = devm_platform_ioremap_resource(pdev, 0);
+       pctl->eint->nbase = 1;
+       /* mtk-eint expects an array */
+       pctl->eint->base = devm_kzalloc(pctl->dev, sizeof(pctl->eint->base), GFP_KERNEL);
+       if (IS_ERR(pctl->eint->base))
+               return -ENOMEM;
+
+       pctl->eint->base[0] = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(pctl->eint->base))
                return PTR_ERR(pctl->eint->base);