diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-03-09 19:20:48 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-07-31 13:37:53 -0400 |
| commit | ef086fef2175789946ee211472aab115d3aee3f3 (patch) | |
| tree | 72cd70d8fcee53a3bd99e42ae8037c6853048ee6 /drivers/pinctrl | |
| parent | 9b964b8ca1fb0061ba462652ad3d4bfecae0d823 (diff) | |
pinctrl: sh-pfc: Update info pointer after SoC-specific init
[ Upstream commit 3091ae775fae17084013021d01513bc1ad274e6a ]
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: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/pinctrl')
| -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 7b2c9495c383..a2b021958213 100644 --- 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_device *pdev) ret = info->ops->init(pfc); if (ret < 0) return ret; + + /* .init() may have overridden pfc->info */ + info = pfc->info; } pinctrl_provide_dummies(); |