openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Sachin Kamat 2012-09-28 04:01:35 -03:00 committed by Mauro Carvalho Chehab
parent d2331c9913
commit 81c9bcfbef
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/s5p-mfc/s5p_mfc.c
View File

@ -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)