Linux Samsung SOC development
 help / color / mirror / Atom feed
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
To: rtc-linux@googlegroups.com, linux-samsung-soc@vger.kernel.org
Cc: ben-linux@fluff.org, a.zummo@towertech.it, p_gortmaker@yahoo.com,
	Jiri.Pinkava@vscht.cz, akpm@linux-foundation.org
Subject: [PATCH 2/2] RTC: s3c: Initialize s3c_rtc_cpu_type before using it
Date: Thu, 27 May 2010 23:28:47 +0200	[thread overview]
Message-ID: <4BFEE40F.8010400@gmail.com> (raw)
In-Reply-To: <cover.1274994983.git.mcuelenaere@gmail.com>

Make sure s3c_rtc_cpu_type is initialised _before_ it's used in an if() check.

This was probably caused due to a merge mistake.

Reported-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
---
 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 6adebf3..70b68d3 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)
 		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);
-- 
1.7.1

  parent reply	other threads:[~2010-05-27 21:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1274994983.git.mcuelenaere@gmail.com>
2010-05-27 21:28 ` [PATCH 1/2] RTC: s3c: Initialize driver data before using it Maurus Cuelenaere
2010-05-27 21:51   ` Andrew Morton
2010-05-27 21:28 ` Maurus Cuelenaere [this message]
2010-05-27 21:52   ` [PATCH 2/2] RTC: s3c: Initialize s3c_rtc_cpu_type " Andrew Morton
2010-05-27 21:55     ` Maurus Cuelenaere

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=4BFEE40F.8010400@gmail.com \
    --to=mcuelenaere@gmail.com \
    --cc=Jiri.Pinkava@vscht.cz \
    --cc=a.zummo@towertech.it \
    --cc=akpm@linux-foundation.org \
    --cc=ben-linux@fluff.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=p_gortmaker@yahoo.com \
    --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