Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pinctrl: pinmux: Release all taken pins in pinmux_enable_setting error paths

Browse source 
Currently pinmux_enable_setting does not release all taken pins if
ops->enable() returns error. This patch ensures all taken pins are
released in any error paths.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Axel Lin 2012-11-10 21:53:20 +08:00 • committed by Linus Walleij
parent 89377aa515
commit e38d457de7
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/pinctrl/pinmux.c
View file

@ -409,11 +409,7 @@ int pinmux_enable_setting(struct pinctrl_setting const *setting)
dev_err(pctldev->dev, dev_err(pctldev->dev,
"could not request pin %d on device %s\n", "could not request pin %d on device %s\n",
pins[i], pinctrl_dev_get_name(pctldev)); pins[i], pinctrl_dev_get_name(pctldev));
/* On error release all taken pins */ goto err_pin_request;
i--; /* this pin just failed */
for (; i >= 0; i--)
pin_free(pctldev, pins[i], NULL);
return -ENODEV;
} }
} }
@ -429,8 +425,26 @@ int pinmux_enable_setting(struct pinctrl_setting const *setting)
desc->mux_setting = &(setting->data.mux); desc->mux_setting = &(setting->data.mux);
} }
return ops->enable(pctldev, setting->data.mux.func, ret = ops->enable(pctldev, setting->data.mux.func,
setting->data.mux.group); setting->data.mux.group);
if (ret)
goto err_enable;
return 0;
err_enable:
for (i = 0; i < num_pins; i++) {
desc = pin_desc_get(pctldev, pins[i]);
if (desc)
desc->mux_setting = NULL;
}
err_pin_request:
/* On error release all taken pins */
while (--i >= 0)
pin_free(pctldev, pins[i], NULL);
return ret;
} }
void pinmux_disable_setting(struct pinctrl_setting const *setting) void pinmux_disable_setting(struct pinctrl_setting const *setting)