From: Sylwester Nawrocki Date: Wed, 18 May 2011 15:06:40 +0000 (-0300) Subject: [media] s5p-csis: Do not use uninitialized variables in s5pcsis_suspend X-Git-Tag: v3.0-rc1~322^2~73 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c68956c14b6accaf6371c8db26deb23fe8e3a3f3;p=karo-tx-linux.git [media] s5p-csis: Do not use uninitialized variables in s5pcsis_suspend Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/s5p-fimc/mipi-csis.c b/drivers/media/video/s5p-fimc/mipi-csis.c index 760fc3c30bf8..ef056d6605ca 100644 --- a/drivers/media/video/s5p-fimc/mipi-csis.c +++ b/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; }