| From 3091ae775fae17084013021d01513bc1ad274e6a Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Thu, 9 Mar 2017 19:20:48 +0100 |
| Subject: pinctrl: sh-pfc: Update info pointer after SoC-specific init |
| |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| |
| commit 3091ae775fae17084013021d01513bc1ad274e6a upstream. |
| |
| Update the sh_pfc_soc_info pointer after calling the SoC-specific |
| initialization function, as it may have been updated to e.g. handle |
| different SoC revisions. This makes sure the correct subdriver name is |
| printed later. |
| |
| Fixes: 0c151062f32c9db8 ("sh-pfc: Add support for SoC-specific initialization") |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pinctrl/sh-pfc/core.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/pinctrl/sh-pfc/core.c |
| +++ b/drivers/pinctrl/sh-pfc/core.c |
| @@ -529,6 +529,9 @@ static int sh_pfc_probe(struct platform_ |
| ret = info->ops->init(pfc); |
| if (ret < 0) |
| return ret; |
| + |
| + /* .init() may have overridden pfc->info */ |
| + info = pfc->info; |
| } |
| |
| pinctrl_provide_dummies(); |
