evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pinctrl: pinctrl-imx: fix map setting problem if NO_PAD_CTL is set

Browse source 
new_map is allocated according to map_num instead of grp->npins,
if a pin or some pins of a group has NO_PAD_CTL property, the map_num
and the grp->npin are different definitely.

When we set mapping information to the new_map[], we should skip those
pins with NO_PAD_CTL from index, otherwise it is possible the driver
will aceesss to a unallocated region.

Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Hui Wang <jason77.wang@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Hui Wang 2012-06-20 18:13:47 +08:00 • committed by Linus Walleij
parent 27e8461cd5
commit 1807161067
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/pinctrl/pinctrl-imx.c
View file

@ -146,7 +146,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
struct pinctrl_map *new_map; struct pinctrl_map *new_map;
struct device_node *parent; struct device_node *parent;
int map_num = 1; int map_num = 1;
int i; int i, j;
/* /*
* first find the group of this node and check if we need create * first find the group of this node and check if we need create
@ -184,13 +184,14 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
/* create config map */ /* create config map */
new_map++; new_map++;
for (i = 0; i < grp->npins; i++) { for (i = j = 0; i < grp->npins; i++) {
if (!(grp->configs[i] & IMX_NO_PAD_CTL)) { if (!(grp->configs[i] & IMX_NO_PAD_CTL)) {
new_map[i].type = PIN_MAP_TYPE_CONFIGS_PIN; new_map[j].type = PIN_MAP_TYPE_CONFIGS_PIN;
new_map[i].data.configs.group_or_pin = new_map[j].data.configs.group_or_pin =
pin_get_name(pctldev, grp->pins[i]); pin_get_name(pctldev, grp->pins[i]);
new_map[i].data.configs.configs = &grp->configs[i]; new_map[j].data.configs.configs = &grp->configs[i];
new_map[i].data.configs.num_configs = 1; new_map[j].data.configs.num_configs = 1;
j++;
} }
} }