---

yaml --- r: 250285 b: refs/heads/master c: c68956c h: refs/heads/master i: 250283: ae4c9be v: v3
git-mirror · May 20, 2011 · 1fcdb08 · 1fcdb08
1 parent 959111e
commit 1fcdb08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5f1220d587df8d62372c11e05d44af14056295f
+refs/heads/master: c68956c14b6accaf6371c8db26deb23fe8e3a3f3
diff --git a/trunk/drivers/media/video/s5p-fimc/mipi-csis.c b/trunk/drivers/media/video/s5p-fimc/mipi-csis.c
@@ -581,7 +581,7 @@ static int s5pcsis_suspend(struct device *dev)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct v4l2_subdev *sd = platform_get_drvdata(pdev);
 	struct csis_state *state = sd_to_csis_state(sd);
-	int ret;
+	int ret = 0;
 
 	v4l2_dbg(1, debug, sd, "%s: flags: 0x%x\n",
 		 __func__, state->flags);
@@ -630,7 +630,7 @@ static int s5pcsis_resume(struct device *dev)
 		ret = pdata->phy_enable(state->pdev, true);
 		if (!ret) {
 			state->flags |= ST_POWERED;
-		} else {
+		} else if (state->supply) {
 			regulator_disable(state->supply);
 			goto unlock;
 		}