提交 81c9bcfb 编写于 作者: S Sachin Kamat 提交者: Mauro Carvalho Chehab

[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: NSachin Kamat <sachin.kamat@linaro.org>
Acked-by: NKamil Debski <k.debski@samsung.com>
Signed-off-by: NSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 d2331c99
...@@ -1215,7 +1215,7 @@ static int s5p_mfc_suspend(struct device *dev) ...@@ -1215,7 +1215,7 @@ static int s5p_mfc_suspend(struct device *dev)
if (m_dev->num_inst == 0) if (m_dev->num_inst == 0)
return 0; return 0;
return s5p_mfc_sleep(m_dev);
if (test_and_set_bit(0, &m_dev->enter_suspend) != 0) { if (test_and_set_bit(0, &m_dev->enter_suspend) != 0) {
mfc_err("Error: going to suspend for a second time\n"); mfc_err("Error: going to suspend for a second time\n");
return -EIO; return -EIO;
...@@ -1234,7 +1234,8 @@ static int s5p_mfc_suspend(struct device *dev) ...@@ -1234,7 +1234,8 @@ static int s5p_mfc_suspend(struct device *dev)
return -EIO; return -EIO;
} }
} }
return 0;
return s5p_mfc_sleep(m_dev);
} }
static int s5p_mfc_resume(struct device *dev) static int s5p_mfc_resume(struct device *dev)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册