Merge branch 'for-mfd' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into for-next (dce7886e) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/mfd/ab8500-core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,7 @@ static struct abx500_ops ab8500_ops = {
		.mask_and_set_register = ab8500_mask_and_set_register,
		.event_registers_startup_state_get = NULL,
		.startup_irq_enabled = NULL,
		.dump_all_banks = ab8500_dump_all_banks,
		};

		static void ab8500_irq_lock(struct irq_data *data)
		@@ -521,6 +522,7 @@ static irqreturn_t ab8500_irq(int irq, void *dev)
		int virq = ab8500_irq_get_virq(ab8500, line);

		handle_nested_irq(virq);
		ab8500_debug_register_interrupt(line);
		value &= ~(1 << bit);

		} while (value);