diff --git a/[refs] b/[refs]
index 4462e56eb0e7..9fac2e21e3af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 809609a5d8427b0025304dbb69a84a692d11c4f9
+refs/heads/master: 1960d58003b735555bb2dc56699530d606698574
diff --git a/trunk/drivers/pinctrl/sh-pfc/core.c b/trunk/drivers/pinctrl/sh-pfc/core.c
index feef89792568..97e6ea3147e0 100644
--- a/trunk/drivers/pinctrl/sh-pfc/core.c
+++ b/trunk/drivers/pinctrl/sh-pfc/core.c
@@ -72,6 +72,7 @@ static void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc,
 	}
 
 	BUG();
+	return NULL;
 }
 
 int sh_pfc_get_pin_index(struct sh_pfc *pfc, unsigned int pin)