From 67b81215a4d86f024d5d18352fc18be4aa84c2bb Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Fri, 16 Mar 2012 11:47:51 -0300 Subject: [PATCH] --- yaml --- r: 306130 b: refs/heads/master c: aa333122c9c7d11d7d8486db09869517995af0a8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/fimc-capture.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa80331c2c20..979a4aecfd76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20676a4c9503dbcbb283c4c6565426dc63b81775 +refs/heads/master: aa333122c9c7d11d7d8486db09869517995af0a8 diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c index b06efd208328..a080f0c91e35 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c @@ -83,7 +83,9 @@ static int fimc_capture_state_cleanup(struct fimc_dev *fimc, bool suspend) fimc->state &= ~(1 << ST_CAPT_RUN | 1 << ST_CAPT_SHUT | 1 << ST_CAPT_STREAM | 1 << ST_CAPT_ISP_STREAM); - if (!suspend) + if (suspend) + fimc->state |= (1 << ST_CAPT_SUSPENDED); + else fimc->state &= ~(1 << ST_CAPT_PEND | 1 << ST_CAPT_SUSPENDED); /* Release unused buffers */ @@ -99,7 +101,6 @@ static int fimc_capture_state_cleanup(struct fimc_dev *fimc, bool suspend) else vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR); } - set_bit(ST_CAPT_SUSPENDED, &fimc->state); fimc_hw_reset(fimc); cap->buf_index = 0;