diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-10 12:27:12 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-10 12:27:11 -0800 |
| commit | 2dc96b1cbbdcf5aef3780696708012d55fec57f2 (patch) | |
| tree | 0cf644b66bf3e90ac3ffe853f6c78b9129265f70 | |
| parent | 9c82f6cac8aa69ef2dae13ee085d8a5fe6feb404 (diff) | |
| parent | 2ef580d6340fe3b9bf5f3ee1bd55f8e4b3a59f63 (diff) | |
Merge "msm: camera: fd: Call fd buffer done on active buffer"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c b/drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c index 66eb3aebec83..c5f5a12d08eb 100644 --- a/drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c +++ b/drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1273,10 +1273,8 @@ static void msm_fd_wq_handler(struct work_struct *work) fd_event->frame_id = ctx->sequence; v4l2_event_queue_fh(&ctx->fh, &event); - if (fd->state == MSM_FD_DEVICE_RUNNING) { - /* Release buffer from the device */ - msm_fd_hw_buffer_done(fd, active_buf, 0); - } + /* Release buffer from the device */ + msm_fd_hw_buffer_done(fd, active_buf, 0); MSM_FD_SPIN_UNLOCK(fd->slock, 1); } |