summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-03-22 12:23:11 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-22 12:23:11 -0700
commitb5b7f77ecf613b4c6c9e8b2c5908528f6840a5f3 (patch)
treee9c65beb3cc949ffc2c9b21552d3c9fefa48cf25
parent926f541b4684f1100c256a28bbcd677fe578c7f7 (diff)
parenteced8c70ba63de84ce75dc5b1c7f1feb5fed4954 (diff)
Merge "ais: set list cmd to be available after del before return"
-rw-r--r--drivers/media/platform/msm/ais/isp/msm_isp_util.c2
1 files changed, 1 insertions, 1 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 3cacb5b0db10..4e19a06597f6 100644
--- a/drivers/media/platform/msm/ais/isp/msm_isp_util.c
+++ b/drivers/media/platform/msm/ais/isp/msm_isp_util.c
@@ -2126,6 +2126,7 @@ void msm_isp_do_tasklet(unsigned long data)
}
atomic_sub(1, &vfe_dev->irq_cnt);
list_del(&queue_cmd->list);
+ queue_cmd->cmd_used = 0;
if (!vfe_dev->clk_enabled) {
/* client closed, delayed task should exit directly */
@@ -2133,7 +2134,6 @@ void msm_isp_do_tasklet(unsigned long data)
return;
}
- queue_cmd->cmd_used = 0;
irq_status0 = queue_cmd->vfeInterruptStatus0;
irq_status1 = queue_cmd->vfeInterruptStatus1;
pingpong_status = queue_cmd->vfePingPongStatus;