diff options
| author |   Geert Uytterhoeven <geert+renesas@glider.be> | 2017-03-09 19:20:48 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-03-21 11:21:55 +0100 |
| commit | 3091ae775fae17084013021d01513bc1ad274e6a (patch) | |
| tree | 5e8a1bac8487fac4cdfa769622dee1358bd345cb /drivers/pinctrl/sh-pfc/core.c | |
| parent | pinctrl: sh-pfc: r8a7795: Restore sort order (diff) | |
| download | linux-dev-3091ae775fae17084013021d01513bc1ad274e6a.tar.xz linux-dev-3091ae775fae17084013021d01513bc1ad274e6a.zip | |
pinctrl: sh-pfc: Update info pointer after SoC-specific init
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>
Diffstat (limited to 'drivers/pinctrl/sh-pfc/core.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c index cf80ce1dd7ce..4a5a0feb931b 100644 --- a/drivers/pinctrl/sh-pfc/core.c +++ b/drivers/pinctrl/sh-pfc/core.c @@ -586,6 +586,9 @@ static int sh_pfc_probe(struct platform_device *pdev) ret = info->ops->init(pfc); if (ret < 0) return ret; + + /* .init() may have overridden pfc->info */ + info = pfc->info; } /* Enable dummy states for those platforms without pinctrl support */ |