diff options
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_csi2.c')
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_csi2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c index 9ae4871928d8..92c2d5b743c7 100644 --- a/drivers/staging/media/omap4iss/iss_csi2.c +++ b/drivers/staging/media/omap4iss/iss_csi2.c @@ -421,6 +421,7 @@ static void csi2_irq_ctx_set(struct iss_csi2_device *csi2, int enable) static void csi2_irq_complexio1_set(struct iss_csi2_device *csi2, int enable) { u32 reg; + reg = CSI2_COMPLEXIO_IRQ_STATEALLULPMEXIT | CSI2_COMPLEXIO_IRQ_STATEALLULPMENTER | CSI2_COMPLEXIO_IRQ_STATEULPM5 | @@ -464,6 +465,7 @@ static void csi2_irq_complexio1_set(struct iss_csi2_device *csi2, int enable) static void csi2_irq_status_set(struct iss_csi2_device *csi2, int enable) { u32 reg; + reg = CSI2_IRQ_OCP_ERR | CSI2_IRQ_SHORT_PACKET | CSI2_IRQ_ECC_CORRECTION | @@ -806,8 +808,8 @@ __csi2_get_format(struct iss_csi2_device *csi2, struct v4l2_subdev_fh *fh, { if (which == V4L2_SUBDEV_FORMAT_TRY) return v4l2_subdev_get_try_format(fh, pad); - else - return &csi2->formats[pad]; + + return &csi2->formats[pad]; } static void |