Pandora Sourcecodes - openembedded.git/blob

   1 From d6e6a76aa9d842ed9f8963ed10fc884cff3af5dd Mon Sep 17 00:00:00 2001
   2 From: Sergio Aguirre <saaguirre@ti.com>
   3 Date: Fri, 9 Jul 2010 16:56:18 -0500
   4 Subject: [PATCH 34/75] omap3isp: Fix Wrong check on non-interlaced sensor on isr
   5
   6 Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
   7 ---
   8  drivers/media/video/isp/isp.c |    9 +++++----
   9  1 files changed, 5 insertions(+), 4 deletions(-)
  10
  11 diff --git a/drivers/media/video/isp/isp.c b/drivers/media/video/isp/isp.c
  12 index 29dd005..2ef2d58 100644
  13 --- a/drivers/media/video/isp/isp.c
  14 +++ b/drivers/media/video/isp/isp.c
  15 @@ -978,11 +978,12 @@ static irqreturn_t omap34xx_isp_isr(int irq, void *_pdev)
  16         }
  17
  18         if (irqstatus & CCDC_VD0) {
  19 -               if (isp->pipeline.pix.field == V4L2_FIELD_INTERLACED) {
  20 +               if (((isp->pipeline.pix.field == V4L2_FIELD_INTERLACED) &&
  21 +                    (isp->current_field != 0)) ||
  22 +                   (isp->pipeline.pix.field != V4L2_FIELD_INTERLACED)) {
  23                         /* Skip even fields, and process only odd fields */
  24 -                       if (isp->current_field != 0)
  25 -                               if (RAW_CAPTURE(isp))
  26 -                                       isp_buf_process(dev, bufs);
  27 +                       if (RAW_CAPTURE(isp))
  28 +                               isp_buf_process(dev, bufs);
  29                 }
  30                 if (!ispccdc_busy(&isp->isp_ccdc))
  31                         ispccdc_config_shadow_registers(&isp->isp_ccdc);
  32 --
  33 1.6.6.1
  34