From cbbf6b9a5d3aea11d56da736d69fd51b7caca3a6 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 4 Jun 2010 14:14:46 -0700 Subject: [PATCH] --- yaml --- r: 199806 b: refs/heads/master c: eaa6e4dd4bf243a357056448e54d7c673cd44acb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-s3c.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 76030bfd6690..bfb403be7d62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e893de59a4982791368b3ce412bc67dd601a88a0 +refs/heads/master: eaa6e4dd4bf243a357056448e54d7c673cd44acb diff --git a/trunk/drivers/rtc/rtc-s3c.c b/trunk/drivers/rtc/rtc-s3c.c index 6adebf31ea69..70b68d35f969 100644 --- a/trunk/drivers/rtc/rtc-s3c.c +++ b/trunk/drivers/rtc/rtc-s3c.c @@ -508,13 +508,13 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) goto err_nortc; } + s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data; + 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); s3c_rtc_setfreq(&pdev->dev, 1);