Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e893de59 authored by Maurus Cuelenaere's avatar Maurus Cuelenaere Committed by Linus Torvalds
Browse files

rtc: s3c: initialize driver data before using it 



s3c_rtc_setfreq() uses the platform driver data to derive struct rtc_device,
so make sure drvdata is set _before_ s3c_rtc_setfreq() is called.

Signed-off-by: default avatarMaurus Cuelenaere <mcuelenaere@gmail.com>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Maurus Cuelenaere <mcuelenaere@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b8a3c609

drivers/rtc/rtc-s3c.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -495,8 +495,6 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) 
 	pr_debug("s3c2410_rtc: RTCCON=%02x\n",

 	pr_debug("s3c2410_rtc: RTCCON=%02x\n",

		 readb(s3c_rtc_base + S3C2410_RTCCON));

		 readb(s3c_rtc_base + S3C2410_RTCCON));





	s3c_rtc_setfreq(&pdev->dev, 1);



	device_init_wakeup(&pdev->dev, 1);

	device_init_wakeup(&pdev->dev, 1);





	/* register RTC and exit */

	/* register RTC and exit */
@@ -518,6 +516,9 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) 
	s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;

	s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;





	platform_set_drvdata(pdev, rtc);

	platform_set_drvdata(pdev, rtc);



	s3c_rtc_setfreq(&pdev->dev, 1);



	return 0;

	return 0;





 err_nortc:

 err_nortc: