diff --git a/[refs] b/[refs]
index 463e5b2e5088..4518e4ca4216 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bea30ed65fb2432097f362ce17042e22febcb616
+refs/heads/master: 8798c4ab56d8f726092870cb2cf15c5a7a0a93bf
diff --git a/trunk/arch/arm/mach-omap2/vp.c b/trunk/arch/arm/mach-omap2/vp.c
index 38076205312e..29698acc2aea 100644
--- a/trunk/arch/arm/mach-omap2/vp.c
+++ b/trunk/arch/arm/mach-omap2/vp.c
@@ -103,6 +103,9 @@ int omap_vp_update_errorgain(struct voltagedomain *voltdm,
 {
 	struct omap_volt_data *volt_data;
 
+	if (!voltdm->vp)
+		return -EINVAL;
+
 	/* Get volt_data corresponding to target_volt */
 	volt_data = omap_voltage_get_voltdata(voltdm, target_volt);
 	if (IS_ERR(volt_data))