rtc: fix potential race condition

RTC drivers must not return an error after device registration.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Reported-by: Ales Novak <alnovak@suse.cz>
Cc: Alexander Shiyan <shc_work@mail.ru>
Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index bc7b4fcf603c..4ff20f9dc212 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -473,7 +473,6 @@ static struct bin_attribute ds1511_nvram_attr = {
 
 static int ds1511_rtc_probe(struct platform_device *pdev)
 {
-        struct rtc_device *rtc;
         struct resource *res;
         struct rtc_plat_data *pdata;
         int ret = 0;
@@ -512,6 +511,12 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
 
         spin_lock_init(&pdata->lock);
         platform_set_drvdata(pdev, pdata);
+
+        pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+                                              &ds1511_rtc_ops, THIS_MODULE);
+        if (IS_ERR(pdata->rtc))
+                return PTR_ERR(pdata->rtc);
+
         /*
          * if the platform has an interrupt in mind for this device,
          * then by all means, set it
@@ -526,15 +531,12 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
                 }
         }
 
-        rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &ds1511_rtc_ops,
-                                        THIS_MODULE);
-        if (IS_ERR(rtc))
-                return PTR_ERR(rtc);
-        pdata->rtc = rtc;
-
         ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);
+        if (ret)
+                dev_err(&pdev->dev, "Unable to create sysfs entry: %s\n",
+                        ds1511_nvram_attr.attr.name);
 
-        return ret;
+        return 0;
 }
 
 static int ds1511_rtc_remove(struct platform_device *pdev)