From 097a11c0b0c14342782ad7f9186b76652d9bd5a7 Mon Sep 17 00:00:00 2001 From: Sungchun Kang Date: Thu, 30 Dec 2010 02:35:28 -0300 Subject: [PATCH] --- yaml --- r: 241783 b: refs/heads/master c: ba10795ed1018488964e6054b5076ec31a471d96 h: refs/heads/master i: 241781: cfd649acc2303b3a1e30b6aa71d10c4e819bb696 241779: 1cd7fbb07f77d2a842bc6a1d53bcbbc938a5857b 241775: c3118f21ab98f910877574d28320a3e821e8e47f v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/fimc-capture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9ec383a2fc50..dab6d6bcfb7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bbe425e57d3ca715cfe9c98bac5f8f07a96c81a +refs/heads/master: ba10795ed1018488964e6054b5076ec31a471d96 diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c index c326f6bbf290..5159cc8a0e1c 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c @@ -204,7 +204,7 @@ static int fimc_stop_capture(struct fimc_dev *fimc) spin_unlock_irqrestore(&fimc->slock, flags); wait_event_timeout(fimc->irq_queue, - test_bit(ST_CAPT_SHUT, &fimc->state), + !test_bit(ST_CAPT_SHUT, &fimc->state), FIMC_SHUTDOWN_TIMEOUT); v4l2_subdev_call(cap->sd, video, s_stream, 0);