On Fri, Jul 17, 2015 at 09:38:43AM +0200, Uwe Kleine-König wrote:
> imx1_pinconf_set assumes that the array of pins in struct
> imx1_pinctrl_soc_info can be indexed by pin id to get the
> pinctrl_pin_desc for a pin. This used to be correct up to commit
> 607af165c047 which removed some entries from the array and so made it
> wrong to access the array by pin id.
>
> The result of this bug is a wrong pin name in the output for small pin
> ids and an oops for the bigger ones.
>
> This patch is the result of a discussion that includes patches by Markus
> Pargmann and Chris Ruehl.
>
> Fixes: 607af165c047 ("pinctrl: i.MX27: Remove nonexistent pad definitions")
> Cc: stable@xxxxxxxxxxxxxxx
> Reported-by: Chris Ruehl <chris.ruehl@xxxxxxxxxxxx>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Reviewed-by: Markus Pargmann <mpa@xxxxxxxxxxxxxx>
> ---
> drivers/pinctrl/freescale/pinctrl-imx1-core.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/freescale/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c
> index 5fd4437cee15..88a7fac11bd4 100644
> --- a/drivers/pinctrl/freescale/pinctrl-imx1-core.c
> +++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c
> @@ -403,14 +403,13 @@ static int imx1_pinconf_set(struct pinctrl_dev *pctldev,
> unsigned num_configs)
> {
> struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
> - const struct imx1_pinctrl_soc_info *info = ipctl->info;
> int i;
>
> for (i = 0; i != num_configs; ++i) {
> imx1_write_bit(ipctl, pin_id, configs[i] & 0x01, MX1_PUEN);
>
> dev_dbg(ipctl->dev, "pinconf set pullup pin %s\n",
> - info->pins[pin_id].name);
> + pin_desc_get(pctldev, pin_id)->name);
> }
>
> return 0;
> --
> 2.1.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: Digital signature
