aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/platform/s5p-mfc
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-09-28 04:01:35 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-02 14:03:47 -0300
commit81c9bcfbefec212548058eeac612d98dc9290d55 (patch)
tree3e3c7c15daaa80ddbad6b3eab7f15bc60c3238df /drivers/media/platform/s5p-mfc
parentd2331c991354a50bf65d114b2e88d77980223035 (diff)
downloadlinaro-lsk-81c9bcfbefec212548058eeac612d98dc9290d55.tar.gz
[media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
return statement was wrongly placed before a code that needs to be executed. Moved the return statement to the end of the function. Tested suspend/resume on SMDK4412 board using 3.5-rc6 kernel. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc')
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 4486a234053..5587ef15ca4 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1215,7 +1215,7 @@ static int s5p_mfc_suspend(struct device *dev)
if (m_dev->num_inst == 0)
return 0;
- return s5p_mfc_sleep(m_dev);
+
if (test_and_set_bit(0, &m_dev->enter_suspend) != 0) {
mfc_err("Error: going to suspend for a second time\n");
return -EIO;
@@ -1234,7 +1234,8 @@ static int s5p_mfc_suspend(struct device *dev)
return -EIO;
}
}
- return 0;
+
+ return s5p_mfc_sleep(m_dev);
}
static int s5p_mfc_resume(struct device *dev)