Merge "power: qpnp-fg-gen4: Fix disabling mem_attn interrupt" (f9ff261f) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/power/supply/qcom/qpnp-fg-gen4.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3080,6 +3080,7 @@ static void pl_current_en_work(struct work_struct *work)
		return;

		vote(chip->parallel_current_en_votable, FG_PARALLEL_EN_VOTER, en, 0);
		vote(chip->mem_attn_irq_en_votable, MEM_ATTN_IRQ_VOTER, false, 0);
		}

		static void pl_enable_work(struct work_struct *work)
		@@ -3719,7 +3720,6 @@ static int fg_parallel_current_en_cb(struct votable votable, void data,

		fg_dbg(fg, FG_STATUS, "Parallel current summing: %d\n", enable);

		vote(chip->mem_attn_irq_en_votable, MEM_ATTN_IRQ_VOTER, false, 0);
		return rc;
		}