Patchwork [2/2] RTC: s3c: Initialize s3c_rtc_cpu_type before using it

login
register
mail settings
Submitter Maurus Cuelenaere
Date May 27, 2010, 9:28 p.m.
Message ID <4BFEE40F.8010400@gmail.com>
Download mbox | patch
Permalink /patch/53815/
State New
Headers show

Comments

Maurus Cuelenaere - May 27, 2010, 9:28 p.m.
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(-)
Andrew Morton - May 27, 2010, 9:52 p.m.
On Thu, 27 May 2010 23:28:47 +0200
Maurus Cuelenaere <mcuelenaere@gmail.com> wrote:

> 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.

Nope, I went back to your original email:

@@ -471,7 +509,12 @@ static int __devinit s3c_rtc_probe(struct
platform_device *pdev)
                goto err_nortc;
        }

-       rtc->max_user_freq = 128;
+       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;
Maurus Cuelenaere - May 27, 2010, 9:55 p.m.
Op 27-05-10 23:52, Andrew Morton schreef:
> On Thu, 27 May 2010 23:28:47 +0200
> Maurus Cuelenaere <mcuelenaere@gmail.com> wrote:
>
>   
>> 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.
>>     
> Nope, I went back to your original email:
>
> @@ -471,7 +509,12 @@ static int __devinit s3c_rtc_probe(struct
> platform_device *pdev)
>                 goto err_nortc;
>         }
>
> -       rtc->max_user_freq = 128;
> +       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;
>   

Hmm, odd. Ok, I apologize for this (obvious) mistake then.

Patch

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);