From 1fcdb086064e6834bd6b09e69ee1e792f0f7913c Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Wed, 18 May 2011 12:06:40 -0300 Subject: [PATCH] --- yaml --- r: 250285 b: refs/heads/master c: c68956c14b6accaf6371c8db26deb23fe8e3a3f3 h: refs/heads/master i: 250283: ae4c9be0ae1194e1a3ef062611d2ff5659d31f8d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/mipi-csis.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 93ef1288a45f..2df2585d6cd6 100644 --- 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 index 760fc3c30bf8..ef056d6605ca 100644 --- 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; }