---

yaml --- r: 251044 b: refs/heads/master c: 88257b2 h: refs/heads/master v: v3
git-mirror · May 11, 2011 · ef002df · ef002df
1 parent 2b192b1
commit ef002df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1f5857e4bc9b2620fb3e84b1dbaa0ac11b831b4
+refs/heads/master: 88257b26953f73f30acf49587cb42b84be43c587
diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c
@@ -4090,6 +4090,11 @@ static int dsi_init(struct platform_device *pdev)
 static void dsi_exit(void)
 {
 	if (dsi.vdds_dsi_reg != NULL) {
+		if (dsi.vdds_dsi_enabled) {
+			regulator_disable(dsi.vdds_dsi_reg);
+			dsi.vdds_dsi_enabled = false;
+		}
+
 		regulator_put(dsi.vdds_dsi_reg);
 		dsi.vdds_dsi_reg = NULL;
 	}