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

Commit 90182317 authored by Kevin Liu's avatar Kevin Liu Committed by Samuel Ortiz
Browse files

mfd: Fix max8925 irq control bit incorrect setting 



In max8925_irq_sync_unlock(), irq control bit is set at the same time.
Zero means enabling irq, and one means disabling irq.

The original code is:
	irq_chg[0] &= irq_data->enable;

It should be changed to:
	irq_chg[0] &= ~irq_data->enable;

Otherwise, irq control bit is mess.

Signed-off-by: default avatarKevin Liu <kliu5@marvell.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c9d66d35

drivers/mfd/max8925-core.c

+7 −6
Original line number Diff line number Diff line
@@ -429,24 +429,25 @@ static void max8925_irq_sync_unlock(unsigned int irq) 
	irq_tsc = cache_tsc;

	for (i = 0; i < ARRAY_SIZE(max8925_irqs); i++) {

		irq_data = &max8925_irqs[i];

		/* 1 -- disable, 0 -- enable */

		switch (irq_data->mask_reg) {

		case MAX8925_CHG_IRQ1_MASK:

			irq_chg[0] &= irq_data->enable;

			irq_chg[0] &= ~irq_data->enable;

			break;

		case MAX8925_CHG_IRQ2_MASK:

			irq_chg[1] &= irq_data->enable;

			irq_chg[1] &= ~irq_data->enable;

			break;

		case MAX8925_ON_OFF_IRQ1_MASK:

			irq_on[0] &= irq_data->enable;

			irq_on[0] &= ~irq_data->enable;

			break;

		case MAX8925_ON_OFF_IRQ2_MASK:

			irq_on[1] &= irq_data->enable;

			irq_on[1] &= ~irq_data->enable;

			break;

		case MAX8925_RTC_IRQ_MASK:

			irq_rtc &= irq_data->enable;

			irq_rtc &= ~irq_data->enable;

			break;

		case MAX8925_TSC_IRQ_MASK:

			irq_tsc &= irq_data->enable;

			irq_tsc &= ~irq_data->enable;

			break;

		default:

			dev_err(chip->dev, "wrong IRQ\n");