diff --git a/[refs] b/[refs]
index 9cd82d71be3a..560637b5589b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aebe495895f5542213dd17a644647b0aae8353f0
+refs/heads/master: 4c78899b92335af0da11e104698e329bb50810b5
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 669d02160221..679f92ec9a45 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2503,7 +2503,8 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
 	int			status = 0;
 
 	/* some attributes need specific methods to be displayed */
-	if (ops->get_voltage || ops->get_voltage_sel) {
+	if ((ops->get_voltage && ops->get_voltage(rdev) >= 0) ||
+	    (ops->get_voltage_sel && ops->get_voltage_sel(rdev) >= 0)) {
 		status = device_create_file(dev, &dev_attr_microvolts);
 		if (status < 0)
 			return status;