Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 241783
b: refs/heads/master
c: ba10795
h: refs/heads/master
i:
  241781: cfd649a
  241779: 1cd7fbb
  241775: c3118f2
v: v3
  • Loading branch information
Sungchun Kang authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent 47b46b3 commit 097a11c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5bbe425e57d3ca715cfe9c98bac5f8f07a96c81a
refs/heads/master: ba10795ed1018488964e6054b5076ec31a471d96
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/s5p-fimc/fimc-capture.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 097a11c

Please sign in to comment.