diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-06-04 17:14:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:21:44 -0400 |
commit | eaa6e4dd4bf243a357056448e54d7c673cd44acb (patch) | |
tree | 426fc027f4107ee520d2caabea2834587fa22a7d /drivers/rtc | |
parent | e893de59a4982791368b3ce412bc67dd601a88a0 (diff) |
rtc: s3c: initialize s3c_rtc_cpu_type before using it
Make sure s3c_rtc_cpu_type is initialised _before_ it's used in an if()
check.
Reported-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Maurus Cuelenaere <mcuelenaere@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-s3c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 6adebf31ea69..70b68d35f969 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
@@ -508,13 +508,13 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) | |||
508 | goto err_nortc; | 508 | goto err_nortc; |
509 | } | 509 | } |
510 | 510 | ||
511 | s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data; | ||
512 | |||
511 | if (s3c_rtc_cpu_type == TYPE_S3C64XX) | 513 | if (s3c_rtc_cpu_type == TYPE_S3C64XX) |
512 | rtc->max_user_freq = 32768; | 514 | rtc->max_user_freq = 32768; |
513 | else | 515 | else |
514 | rtc->max_user_freq = 128; | 516 | rtc->max_user_freq = 128; |
515 | 517 | ||
516 | s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data; | ||
517 | |||
518 | platform_set_drvdata(pdev, rtc); | 518 | platform_set_drvdata(pdev, rtc); |
519 | 519 | ||
520 | s3c_rtc_setfreq(&pdev->dev, 1); | 520 | s3c_rtc_setfreq(&pdev->dev, 1); |