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

Commit a820e568 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Samuel Ortiz
Browse files

mfd: twl6030-irq: Add error check when IRQs are masked initially 



Add a missed check for errors when TWL IRQs are masked
initially on probe and report an error in case of failure.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Acked-by: default avatarGraeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 87343e53

drivers/mfd/twl6030-irq.c

+9 −4
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ int twl6030_init_irq(struct device *dev, int irq_num) 
	struct			device_node *node = dev->of_node;

	int			nr_irqs, irq_base, irq_end;

	static struct irq_chip  twl6030_irq_chip;

	int			status = 0;

	int			status;

	int			i;

	u8			mask[3];
@@ -335,11 +335,16 @@ int twl6030_init_irq(struct device *dev, int irq_num) 
	mask[2] = 0xFF;



	/* mask all int lines */

	twl_i2c_write(TWL_MODULE_PIH, &mask[0], REG_INT_MSK_LINE_A, 3);

	status = twl_i2c_write(TWL_MODULE_PIH, &mask[0], REG_INT_MSK_LINE_A, 3);

	/* mask all int sts */

	twl_i2c_write(TWL_MODULE_PIH, &mask[0], REG_INT_MSK_STS_A, 3);

	status |= twl_i2c_write(TWL_MODULE_PIH, &mask[0], REG_INT_MSK_STS_A, 3);

	/* clear INT_STS_A,B,C */

	twl_i2c_write(TWL_MODULE_PIH, &mask[0], REG_INT_STS_A, 3);

	status |= twl_i2c_write(TWL_MODULE_PIH, &mask[0], REG_INT_STS_A, 3);



	if (status < 0) {

		dev_err(dev, "I2C err writing TWL_MODULE_PIH: %d\n", status);

		return status;

	}



	twl6030_irq_base = irq_base;