Commit a9c5e533 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

pinctrl: sh-pfc: Update info pointer after SoC-specific init

commit 3091ae77 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: 0c151062 ("sh-pfc: Add support for SoC-specific initialization")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59326554
...@@ -586,6 +586,9 @@ static int sh_pfc_probe(struct platform_device *pdev) ...@@ -586,6 +586,9 @@ static int sh_pfc_probe(struct platform_device *pdev)
ret = info->ops->init(pfc); ret = info->ops->init(pfc);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* .init() may have overridden pfc->info */
info = pfc->info;
} }
/* Enable dummy states for those platforms without pinctrl support */ /* Enable dummy states for those platforms without pinctrl support */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment