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

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

Merge "msm: ipa: merge error fix" into msm-4.14

parents 07f760e9 443a625e

drivers/platform/msm/gsi/gsi.c

+3 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static void gsi_handle_irq(void) 
		if (type & GSI_EE_n_CNTXT_TYPE_IRQ_GENERAL_BMSK)

			gsi_handle_general(ee);



		if (++cnt > GSI_ISR_MAX_ITER)

		if (++cnt > GSI_ISR_MAX_ITER) {

			/*

			 * Max number of spurious interrupts from hardware.

			 * Unexpected hardware state.
@@ -636,6 +636,8 @@ static void gsi_handle_irq(void) 
			GSIERR("Too many spurious interrupt from GSI HW\n");

			BUG();

		}



	}

}



static irqreturn_t gsi_isr(int irq, void *ctxt)

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

+1 −1
Original line number Diff line number Diff line
@@ -2569,7 +2569,7 @@ void ipa_init_ep_flt_bitmap(void) 
	const struct ipa_gsi_ep_config *gsi_ep_ptr;



	bitmap = 0;

	if (!ipa3_ctx->ep_flt_bitmap) {

	if (ipa3_ctx->ep_flt_bitmap) {

		WARN_ON(1);

		return;

	}