From: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>,
Doug Anderson <dianders@chromium.org>,
Olof Johansson <olof@lixom.net>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
rtc-linux@googlegroups.com, linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Subject: [PATCH RESEND v9 3/5] rtc: max77686: Fail to probe if no RTC regmap irqchip is set
Date: Fri, 12 Sep 2014 10:17:41 +0200 [thread overview]
Message-ID: <1410509864-10019-4-git-send-email-javier.martinez@collabora.co.uk> (raw)
In-Reply-To: <1410509864-10019-1-git-send-email-javier.martinez@collabora.co.uk>
The max77686 mfd driver adds a regmap IRQ chip which creates an
IRQ domain that is used to map the virtual RTC alarm1 interrupt.
The RTC driver assumes that this will always be true since the
PMIC IRQ is a required property according to the max77686 DT
binding doc. If an "interrupts" property is not defined for a
max77686 PMIC, then the mfd probe function will fail and the
RTC platform driver will never be probed. But even when it is
not possible to probe the rtc-max77686 driver without a regmap
IRQ chip, it's better to explicitly check if the IRQ chip data
is not NULL and gracefully fail instead of getting an OOPS.
Reported-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---
Fixes the issue reported by Krzystof in: https://lkml.org/lkml/2014/8/8/121
---
drivers/rtc/rtc-max77686.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c
index 7bb5433..55396bb 100644
--- a/drivers/rtc/rtc-max77686.c
+++ b/drivers/rtc/rtc-max77686.c
@@ -466,6 +466,12 @@ static int max77686_rtc_probe(struct platform_device *pdev)
goto err_rtc;
}
+ if (!max77686->rtc_irq_data) {
+ ret = -EINVAL;
+ dev_err(&pdev->dev, "%s: no RTC regmap IRQ chip\n", __func__);
+ goto err_rtc;
+ }
+
info->virq = regmap_irq_get_virq(max77686->rtc_irq_data,
MAX77686_RTCIRQ_RTCA1);
if (!info->virq) {
--
2.0.0.rc2
next prev parent reply other threads:[~2014-09-12 8:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 8:17 [PATCH RESEND v9 0/5] Add Maxim 77802 RTC support Javier Martinez Canillas
2014-09-12 8:17 ` [PATCH RESEND v9 1/5] rtc: max77686: Allow the max77686 rtc to wakeup the system Javier Martinez Canillas
2014-09-12 15:12 ` Doug Anderson
2014-09-12 15:54 ` Javier Martinez Canillas
2014-09-12 16:03 ` Doug Anderson
2014-09-12 22:05 ` Andrew Morton
2014-09-15 14:03 ` Javier Martinez Canillas
2014-09-12 8:17 ` [PATCH RESEND v9 2/5] rtc: max77686: Remove dead code for SMPL and WTSR Javier Martinez Canillas
2014-09-12 8:17 ` Javier Martinez Canillas [this message]
2014-09-12 8:17 ` [PATCH RESEND v9 4/5] rtc: max77686: Remove unneded info log Javier Martinez Canillas
2014-09-12 8:17 ` [PATCH RESEND v9 5/5] rtc: Add driver for Maxim 77802 PMIC Real-Time-Clock Javier Martinez Canillas
2014-09-12 22:13 ` Andrew Morton
2014-09-15 14:07 ` Javier Martinez Canillas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410509864-10019-4-git-send-email-javier.martinez@collabora.co.uk \
--to=javier.martinez@collabora.co.uk \
--cc=a.zummo@towertech.it \
--cc=akpm@linux-foundation.org \
--cc=dianders@chromium.org \
--cc=k.kozlowski@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rtc-linux@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®