diff --git a/[refs] b/[refs]
index 69dc17b22707..d1e253e12bff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48b1e3e80f742bff0f469245f2d05007af9af92e
+refs/heads/master: 542a564d2ddbd2c37536b4dff8e45fa0fc239bcc
diff --git a/trunk/drivers/pinctrl/sh-pfc/gpio.c b/trunk/drivers/pinctrl/sh-pfc/gpio.c
index d7acb06d888c..7a54ec79518b 100644
--- a/trunk/drivers/pinctrl/sh-pfc/gpio.c
+++ b/trunk/drivers/pinctrl/sh-pfc/gpio.c
@@ -384,6 +384,9 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 	}
 
 	/* Register the function GPIOs chip. */
+	if (pfc->info->nr_func_gpios == 0)
+		return 0;
+
 	chip = sh_pfc_add_gpiochip(pfc, gpio_function_setup);
 	if (IS_ERR(chip))
 		return PTR_ERR(chip);