Merge "asoc: Improve msm-cdc-supply vote checks and messages"

asoc/codecs/msm-cdc-supply.c

@@ -270,7 +270,11 @@ bool msm_cdc_check_supply_vote(struct device *dev,
 		return cdc_vreg[i].vote;
 	}
 
-	return rc;
+	dev_err_ratelimited(dev,
+		"%s: Unable to find vote for supply %s\n",
+		__func__, supply_name);
+
+	return -EINVAL;
 }
 EXPORT_SYMBOL(msm_cdc_check_supply_vote);
 
@@ -350,15 +354,26 @@ int msm_cdc_disable_ondemand_supply(struct device *dev,
 	if (rc)
 		return rc;
 
+	dev_dbg(dev, "%s: Disabling on-demand supply %s\n",
+		__func__, supply_name);
+
 	for (i = 0; i < num_supplies; i++) {
 		if (cdc_vreg[i].ondemand &&
 			!strcmp(cdc_vreg[i].name, supply_name)) {
+			if (!cdc_vreg[i].vote) {
+				dev_err_ratelimited(dev,
+					"%s: Attempted to disable already disabled supply %s\n",
+					__func__, supplies[i].supply);
+				break;
+			}
+
 			rc = regulator_disable(supplies[i].consumer);
 			if (rc)
 				dev_err_ratelimited(dev,
 					"%s: failed to disable supply %s, err:%d\n",
 					__func__, supplies[i].supply, rc);
-			cdc_vreg[i].vote = false;
+			else
+				cdc_vreg[i].vote = false;
 			break;
 		}
 	}
@@ -402,14 +417,25 @@ int msm_cdc_enable_ondemand_supply(struct device *dev,
 	if (rc)
 		return rc;
 
+	dev_dbg(dev, "%s: Enabling on-demand supply %s\n",
+		__func__, supply_name);
+
 	for (i = 0; i < num_supplies; i++) {
 		if (cdc_vreg[i].ondemand &&
 			!strcmp(cdc_vreg[i].name, supply_name)) {
+			if (cdc_vreg[i].vote) {
+				dev_err_ratelimited(dev,
+					"%s: Attempted to enable already enabled supply %s\n",
+					__func__, supplies[i].supply);
+				break;
+			}
+
 			rc = regulator_enable(supplies[i].consumer);
 			if (rc)
 				dev_err_ratelimited(dev, "%s: failed to enable supply %s, rc: %d\n",
 					__func__, supplies[i].supply, rc);
-			cdc_vreg[i].vote = true;
+			else
+				cdc_vreg[i].vote = true;
 			break;
 		}
 	}
@@ -604,8 +630,8 @@ int msm_cdc_enable_static_supplies(struct device *dev,
 			dev_err(dev, "%s: failed to enable supply %s, rc: %d\n",
 				__func__, supplies[i].supply, rc);
 			break;
-		}
-		cdc_vreg[i].vote = true;
+		} else
+			cdc_vreg[i].vote = true;
 	}
 
 	if (rc) {