Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88ec4103 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: adjust irq processing order"

parents 1d6fdbf4 d212f5c5

drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ static void msm_isp_unprepare_v4l2_buf( 
			if (buf_pending->mapped_info == mapped_info) {

				list_del(&buf_pending->list);

				kfree(buf_pending);

				buf_pending = NULL;

				break;

			}

		}

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+2 −2
Original line number Diff line number Diff line
@@ -2012,12 +2012,12 @@ void msm_isp_do_tasklet(unsigned long data) 
			continue;

		}

		msm_isp_process_error_info(vfe_dev);

		irq_ops->process_camif_irq(vfe_dev,

			irq_status0, irq_status1, &ts);

		irq_ops->process_stats_irq(vfe_dev,

			irq_status0, irq_status1, &ts);

		irq_ops->process_axi_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,

			irq_status0, irq_status1, &ts);

		irq_ops->process_epoch_irq(vfe_dev,