Op 27-05-10 23:52, Andrew Morton schreef: > On Thu, 27 May 2010 23:28:47 +0200 > Maurus Cuelenaere <mcuelenaere@xxxxxxxxx> 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. -- Maurus Cuelenaere -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |