mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
pinctrl: renesas: rzg2l: Fix locking in rzg2l_dt_subnode_to_map()
Commitd3aaa7203a
("pinctrl: renesas: rzg2l: Add pin configuration support for pinmux groups") introduced the possibility to parse pin configuration for pinmux groups. It did that by calling rzg2l_map_add_config() at the end of rzg2l_dt_subnode_to_map() and jumping to the remove_group label in case rzg2l_map_add_config() failed. But if that happens, the mutex will already be unlocked, thus this it will lead to double mutex unlock operation. To fix this move the rzg2l_map_add_config() call just after all the name argument is ready and before the mutex is locked. There is no harm in doing this, as this only parses the data from device tree that will be further processed by pinctrl core code. Fixes:d3aaa7203a
("pinctrl: renesas: rzg2l: Add pin configuration support for pinmux groups") Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/all/f8c3a3a0-7c48-4e40-8af0-ed4e9d9b049f@moroto.mountain Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/20240115153453.99226-1-claudiu.beznea.uj@bp.renesas.com Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
This commit is contained in:
parent
6613476e22
commit
bd433c25ca
1 changed files with 10 additions and 10 deletions
|
@ -447,6 +447,16 @@ static int rzg2l_dt_subnode_to_map(struct pinctrl_dev *pctldev,
|
||||||
name = np->name;
|
name = np->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (num_configs) {
|
||||||
|
ret = rzg2l_map_add_config(&maps[idx], name,
|
||||||
|
PIN_MAP_TYPE_CONFIGS_GROUP,
|
||||||
|
configs, num_configs);
|
||||||
|
if (ret < 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
idx++;
|
||||||
|
}
|
||||||
|
|
||||||
mutex_lock(&pctrl->mutex);
|
mutex_lock(&pctrl->mutex);
|
||||||
|
|
||||||
/* Register a single pin group listing all the pins we read from DT */
|
/* Register a single pin group listing all the pins we read from DT */
|
||||||
|
@ -474,16 +484,6 @@ static int rzg2l_dt_subnode_to_map(struct pinctrl_dev *pctldev,
|
||||||
maps[idx].data.mux.function = name;
|
maps[idx].data.mux.function = name;
|
||||||
idx++;
|
idx++;
|
||||||
|
|
||||||
if (num_configs) {
|
|
||||||
ret = rzg2l_map_add_config(&maps[idx], name,
|
|
||||||
PIN_MAP_TYPE_CONFIGS_GROUP,
|
|
||||||
configs, num_configs);
|
|
||||||
if (ret < 0)
|
|
||||||
goto remove_group;
|
|
||||||
|
|
||||||
idx++;
|
|
||||||
}
|
|
||||||
|
|
||||||
dev_dbg(pctrl->dev, "Parsed %pOF with %d pins\n", np, num_pinmux);
|
dev_dbg(pctrl->dev, "Parsed %pOF with %d pins\n", np, num_pinmux);
|
||||||
ret = 0;
|
ret = 0;
|
||||||
goto done;
|
goto done;
|
||||||
|
|
Loading…
Reference in a new issue