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

geertu · gregkh · commit 174ddbcc69e2 · 2017-07-15T11:57:46.000+02:00
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: 0c15106 ("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>
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
@@ -543,6 +543,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 */

Original file line number	Diff line number	Diff line change
`@@ -543,6 +543,9 @@ static int sh_pfc_probe(struct platform_device *pdev)`
`543`	`543`	`ret = info->ops->init(pfc);`
`544`	`544`	`if (ret < 0)`
`545`	`545`	`return ret;`
	`546`	`+`
	`547`	`+ /* .init() may have overridden pfc->info */`
	`548`	`+ info = pfc->info;`
`546`	`549`	`}`
`547`	`550`
`548`	`551`	`/* Enable dummy states for those platforms without pinctrl support */`