rtc: fix driver data issues in several rtc drivers
Herton Ronaldo Krzesinski recently raised up, and fixed, an issue with the rtc_cmos driver, which was referring to an inconsistent driver data. This patch ensures that driver data registration happens before rtc_device_register(). Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Acked-by: Thomas Hommel <thomas.hommel@gefanuc.com> Acked-by: Hans-Christian Egtvedt <hcegtvedt@atmel.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Cc: David S. Miller <davem@davemloft.net> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andrew Sharp <andy.sharp@onstor.com> Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Cc: Alexander Bigga <ab@mycable.de> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Mark Zhan <rongkai.zhan@windriver.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
d1b2efa83f
commit
b74d2caa64
@@ -304,7 +304,6 @@ static int rtc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct v3020_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct v3020 *chip;
|
||||
struct rtc_device *rtc;
|
||||
int retval = -EBUSY;
|
||||
int i;
|
||||
int temp;
|
||||
@@ -353,13 +352,12 @@ static int rtc_probe(struct platform_device *pdev)
|
||||
|
||||
platform_set_drvdata(pdev, chip);
|
||||
|
||||
rtc = rtc_device_register("v3020",
|
||||
chip->rtc = rtc_device_register("v3020",
|
||||
&pdev->dev, &v3020_rtc_ops, THIS_MODULE);
|
||||
if (IS_ERR(rtc)) {
|
||||
retval = PTR_ERR(rtc);
|
||||
if (IS_ERR(chip->rtc)) {
|
||||
retval = PTR_ERR(chip->rtc);
|
||||
goto err_io;
|
||||
}
|
||||
chip->rtc = rtc;
|
||||
|
||||
return 0;
|
||||
|
||||
|
Reference in New Issue
Block a user