From: w.sang@pengutronix.de (Wolfram Sang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/6] rtc: stmp3xxx: fix crash on boot
Date: Thu, 5 May 2011 12:22:19 +0200 [thread overview]
Message-ID: <1304590941-11813-5-git-send-email-w.sang@pengutronix.de> (raw)
In-Reply-To: <1304590941-11813-1-git-send-email-w.sang@pengutronix.de>
Commit f44f7f96a20 ("RTC: Initialize kernel state from RTC") caused a
crash using the mxs/stmp-rtc driver.
The reason is that rtc_device_register() calls rtc_read_alarm() after
that change, when the driver does not have all driver data set up yet.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
drivers/rtc/rtc-stmp3xxx.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
index 2f8f32e..d3937eb 100644
--- a/drivers/rtc/rtc-stmp3xxx.c
+++ b/drivers/rtc/rtc-stmp3xxx.c
@@ -172,6 +172,7 @@ static int stmp3xxx_rtc_remove(struct platform_device *pdev)
free_irq(rtc_data->irq_alarm, &pdev->dev);
free_irq(rtc_data->irq_1msec, &pdev->dev);
rtc_device_unregister(rtc_data->rtc);
+ platform_set_drvdata(pdev, NULL);
iounmap(rtc_data->io);
kfree(rtc_data);
@@ -212,11 +213,14 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
goto out_remap;
}
+ platform_set_drvdata(pdev, rtc_data);
+
mxs_reset_block(rtc_data->io);
__mxs_clrl(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
rtc_data->io + STMP3XXX_RTC_PERSISTENT0);
+
rtc_data->rtc = rtc_device_register(pdev->name, &pdev->dev,
&stmp3xxx_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc_data->rtc)) {
@@ -240,8 +244,6 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
goto out_irq1;
}
- platform_set_drvdata(pdev, rtc_data);
-
return 0;
out_irq1:
@@ -251,6 +253,7 @@ out_irq_alarm:
rtc_data->io + STMP3XXX_RTC_CTRL);
rtc_device_unregister(rtc_data->rtc);
out_remap:
+ platform_set_drvdata(pdev, NULL);
iounmap(rtc_data->io);
out_free:
kfree(rtc_data);
--
1.7.2.5
next prev parent reply other threads:[~2011-05-05 10:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-05 10:22 [PATCH 0/6] drop IRQF_DISABLED from RTC, then convert stmp-rtc to mach-mxs Wolfram Sang
2011-05-05 10:22 ` [PATCH 1/6] rtc: remove IRQF_DISABLED Wolfram Sang
2011-05-05 10:22 ` [PATCH 2/6] rtc: stmp3xxx: get rid of platform-specific register include Wolfram Sang
2011-05-05 10:22 ` [PATCH 3/6] rtc: stmp3xxx: port stmp-functions to mxs-equivalents Wolfram Sang
2011-05-05 10:22 ` Wolfram Sang [this message]
2011-05-05 10:22 ` [PATCH 5/6] rtc: stmp3xxx: get rid of mach-specific accessors Wolfram Sang
2011-05-05 10:22 ` [PATCH 6/6] rtc: stmp3xxx: remove UIE handlers Wolfram Sang
2011-05-17 14:27 ` [PATCH 0/6] drop IRQF_DISABLED from RTC, then convert stmp-rtc to mach-mxs Shawn Guo
2011-05-17 15:04 ` Wolfram Sang
2011-05-18 2:37 ` Shawn Guo
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=1304590941-11813-5-git-send-email-w.sang@pengutronix.de \
--to=w.sang@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).