Skip to content

Commit

Permalink
[media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sachin Kamat authored and Mauro Carvalho Chehab committed Oct 2, 2012
1 parent d2331c9 commit 81c9bcf
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/media/platform/s5p-mfc/s5p_mfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 81c9bcf

Please sign in to comment.