[PATCH] mfd: max77686: make interrupts support optional
From: Lee Jones <hidden>
Date: 2014-08-20 08:19:18
Also in:
lkml
On Wed, 20 Aug 2014, Marek Szyprowski wrote:
quoted hunk ↗ jump to hunk
Commit 6f1c1e71d93 ("mfd: max77686: Convert to use regmap_irq") broke support for boards, which provide no irq for MAX 77686 PMIC. In such case, not all functions of PMIC are available, but the driver still should at least handle voltage regulators instead of failing to init. This patch restores previous behavior. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- Hello, This patch fixes booting issues with recently merged support for Exynos4412 based Odroid X2/U3 boards. See http://www.spinics.net/lists/linux-samsung-soc/msg35773.html thread for more details. Best regards Marek Szyprowski Samsung R&D Institute Poland --- drivers/mfd/max77686.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-)diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index 86e552348db4..525718c448c8 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c
[...]
quoted hunk ↗ jump to hunk
@@ -357,8 +363,10 @@ static int max77686_i2c_remove(struct i2c_client *i2c) mfd_remove_devices(max77686->dev); - regmap_del_irq_chip(max77686->irq, max77686->rtc_irq_data); - regmap_del_irq_chip(max77686->irq, max77686->irq_data); + if (max77686->irq) + regmap_del_irq_chip(max77686->irq, max77686->rtc_irq_data); + if (max77686->irq) + regmap_del_irq_chip(max77686->irq, max77686->irq_data);
Looks like you rushed this patch and went a bit crazy with
copy-paste. :)
Please put these two regmap_del_irq_chip()'s as results of the same
conditional i.e:
if (max77686->irq) {
regmap_del_irq_chip(max77686->irq, max77686->rtc_irq_data);
regmap_del_irq_chip(max77686->irq, max77686->irq_data);
}
if (max77686->type == TYPE_MAX77686) i2c_unregister_device(max77686->rtc);
-- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog