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

Commit fd4231b2 authored by Pratap Nirujogi's avatar Pratap Nirujogi Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: cpp: Check for valid tx level 



check for valid tx level before reading the tx fifo

Change-Id: I5600debb0eeaea84b37fe357c598fd13a3238e70
Signed-off-by: default avatarPratap Nirujogi <pratapn@codeaurora.org>
parent 7d7c5b26

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+9 −3
Original line number Diff line number Diff line
@@ -949,10 +949,15 @@ static irqreturn_t msm_cpp_irq(int irq_num, void *data) 
	if (irq_status & 0x8) {

		tx_level = msm_camera_io_r(cpp_dev->base +

			MSM_CPP_MICRO_FIFO_TX_STAT) >> 2;

		if (tx_level < MSM_CPP_TX_FIFO_LEVEL) {

			for (i = 0; i < tx_level; i++) {

				tx_fifo[i] = msm_camera_io_r(cpp_dev->base +

					MSM_CPP_MICRO_FIFO_TX_DATA);

			}

		} else {

			pr_err("Fatal invalid tx level %d", tx_level);

			goto err;

		}

		spin_lock_irqsave(&cpp_dev->tasklet_lock, flags);

		queue_cmd = &cpp_dev->tasklet_queue_cmd[cpp_dev->taskletq_idx];

		if (queue_cmd->cmd_used) {
@@ -1006,6 +1011,7 @@ static irqreturn_t msm_cpp_irq(int irq_num, void *data) 
		pr_debug("DEBUG_R1: 0x%x\n",

			msm_camera_io_r(cpp_dev->base + 0x8C));

	}

err:

	msm_camera_io_w(irq_status, cpp_dev->base + MSM_CPP_MICRO_IRQGEN_CLR);

	return IRQ_HANDLED;

}