[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <53074DC6.8070801@epfl.ch>
Date: Fri, 21 Feb 2014 13:59:50 +0100
From: Florian Vaussard <florian.vaussard@...l.ch>
To: Luis Henriques <luis.henriques@...onical.com>,
linux-kernel@...r.kernel.org, stable@...r.kernel.org,
kernel-team@...ts.ubuntu.com
CC: Linus Walleij <linus.walleij@...aro.org>
Subject: Re: [PATCH 3.11 032/121] pinctrl: do not init debugfs entries for
unimplemented functionalities
Hi,
On 02/21/2014 01:47 PM, Luis Henriques wrote:
> 3.11.10.5 -stable review patch. If anyone has any objections, please let me know.
>
This was nack'ed by Greg KH a few days ago. Please see [1].
Regards,
Florian
[1] http://www.spinics.net/lists/stable/msg35959.html
> ------------------
>
> From: Florian Vaussard <florian.vaussard@...l.ch>
>
> commit e7f2a444891cb39f11d5429467d0fd7e011fe7fe upstream.
>
> Commit c420619 "pinctrl: pinconf: remove checks on ops->pin_config_get"
> removed the check on (ops != NULL) when performing pinconf_pins_show() or
> pinconf_groups_show(). As these entries are always enabled, even if
> pinconf is not supported, reading will result in an oops due to NULL
> ops.
>
> Instead of checking for ops, remove the corresponding debugfs entries if
> pinconf and/or pinmux are not implemented.
>
> Tested on OMAP3 (pinctrl-single).
>
> Signed-off-by: Florian Vaussard <florian.vaussard@...l.ch>
> Signed-off-by: Linus Walleij <linus.walleij@...aro.org>
> Signed-off-by: Luis Henriques <luis.henriques@...onical.com>
> ---
> drivers/pinctrl/core.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
> index dbcf284..dec5787 100644
> --- a/drivers/pinctrl/core.c
> +++ b/drivers/pinctrl/core.c
> @@ -1621,8 +1621,10 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
> device_root, pctldev, &pinctrl_groups_ops);
> debugfs_create_file("gpio-ranges", S_IFREG | S_IRUGO,
> device_root, pctldev, &pinctrl_gpioranges_ops);
> - pinmux_init_device_debugfs(device_root, pctldev);
> - pinconf_init_device_debugfs(device_root, pctldev);
> + if (pctldev->desc->pmxops)
> + pinmux_init_device_debugfs(device_root, pctldev);
> + if (pctldev->desc->confops)
> + pinconf_init_device_debugfs(device_root, pctldev);
> }
>
> static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists