diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2011-05-18 11:06:40 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 10:32:57 -0400 |
commit | c68956c14b6accaf6371c8db26deb23fe8e3a3f3 (patch) | |
tree | fed9a29eeebce1f2d7cea36f247f868237b0ca85 | |
parent | b5f1220d587df8d62372c11e05d44af14056295f (diff) |
[media] s5p-csis: Do not use uninitialized variables in s5pcsis_suspend
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/s5p-fimc/mipi-csis.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/s5p-fimc/mipi-csis.c b/drivers/media/video/s5p-fimc/mipi-csis.c index 760fc3c30bf..ef056d6605c 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) | |||
581 | struct platform_device *pdev = to_platform_device(dev); | 581 | struct platform_device *pdev = to_platform_device(dev); |
582 | struct v4l2_subdev *sd = platform_get_drvdata(pdev); | 582 | struct v4l2_subdev *sd = platform_get_drvdata(pdev); |
583 | struct csis_state *state = sd_to_csis_state(sd); | 583 | struct csis_state *state = sd_to_csis_state(sd); |
584 | int ret; | 584 | int ret = 0; |
585 | 585 | ||
586 | v4l2_dbg(1, debug, sd, "%s: flags: 0x%x\n", | 586 | v4l2_dbg(1, debug, sd, "%s: flags: 0x%x\n", |
587 | __func__, state->flags); | 587 | __func__, state->flags); |
@@ -630,7 +630,7 @@ static int s5pcsis_resume(struct device *dev) | |||
630 | ret = pdata->phy_enable(state->pdev, true); | 630 | ret = pdata->phy_enable(state->pdev, true); |
631 | if (!ret) { | 631 | if (!ret) { |
632 | state->flags |= ST_POWERED; | 632 | state->flags |= ST_POWERED; |
633 | } else { | 633 | } else if (state->supply) { |
634 | regulator_disable(state->supply); | 634 | regulator_disable(state->supply); |
635 | goto unlock; | 635 | goto unlock; |
636 | } | 636 | } |