From: anarsoul@gmail.com (Vasily Khoruzhick)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] rtc-s3c: Fix rtc-s3c driver initialization
Date: Thu, 27 May 2010 17:48:29 +0300 [thread overview]
Message-ID: <1274971709-7874-1-git-send-email-anarsoul@gmail.com> (raw)
setfreq should be called only after rtc device registration,
as it uses rtc device; s3c_rtc_cpu_type should be checked
only once it was set.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
drivers/rtc/rtc-s3c.c | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index e5972b2..6b47f53 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -488,7 +488,19 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
goto err_nomap;
}
- /* check to see if everything is setup correctly */
+ /* Register rtc and check to see if everything is setup correctly */
+ rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops,
+ THIS_MODULE);
+
+ if (IS_ERR(rtc)) {
+ dev_err(&pdev->dev, "cannot attach rtc\n");
+ ret = PTR_ERR(rtc);
+ goto err_nortc;
+ }
+
+ s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
+
+ platform_set_drvdata(pdev, rtc);
s3c_rtc_enable(pdev, 1);
@@ -499,25 +511,11 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 1);
- /* register RTC and exit */
-
- rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops,
- THIS_MODULE);
-
- if (IS_ERR(rtc)) {
- dev_err(&pdev->dev, "cannot attach rtc\n");
- ret = PTR_ERR(rtc);
- goto err_nortc;
- }
-
if (s3c_rtc_cpu_type == TYPE_S3C64XX)
rtc->max_user_freq = 32768;
else
rtc->max_user_freq = 128;
- s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
-
- platform_set_drvdata(pdev, rtc);
return 0;
err_nortc:
--
1.7.1
next reply other threads:[~2010-05-27 14:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-27 14:48 Vasily Khoruzhick [this message]
2010-05-27 14:58 ` [PATCH] rtc-s3c: Fix rtc-s3c driver initialization Vasily Khoruzhick
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=1274971709-7874-1-git-send-email-anarsoul@gmail.com \
--to=anarsoul@gmail.com \
--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).