summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2018-01-25 11:37:38 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-01-25 11:37:38 -0800
commitf75d803a01547c709bf40f2577e58d7e0ffec2cf (patch)
treef10a7f4847037e01e28b44ed39bdc953c6c63623
parentd09447b9581c3e73d5bb5724d4cddb232da5a8ff (diff)
parent1ceec25182248bec78ddb2c001f47f708f6d97f5 (diff)
Merge "ais: move axi_irq process before sof_irq"
-rw-r--r--drivers/media/platform/msm/ais/isp/msm_isp_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/ais/isp/msm_isp_util.c b/drivers/media/platform/msm/ais/isp/msm_isp_util.c
index 8f5a2f72da0c..b318dd0c6bfe 100644
--- a/drivers/media/platform/msm/ais/isp/msm_isp_util.c
+++ b/drivers/media/platform/msm/ais/isp/msm_isp_util.c
@@ -2153,11 +2153,11 @@ void msm_isp_do_tasklet(unsigned long data)
irq_ops->process_stats_irq(vfe_dev,
irq_status0, irq_status1,
pingpong_status, &ts);
- irq_ops->process_sof_irq(vfe_dev,
- irq_status0, irq_status1, &ts);
irq_ops->process_axi_irq(vfe_dev,
irq_status0, irq_status1,
pingpong_status, &ts);
+ irq_ops->process_sof_irq(vfe_dev,
+ irq_status0, irq_status1, &ts);
irq_ops->process_camif_irq(vfe_dev,
irq_status0, irq_status1, &ts);
irq_ops->process_reg_update(vfe_dev,