rtc: rtc-davinci: return correct error code if rtc_device_register() fails
authorDevendra Naga <devendra.aaru@gmail.com>
Tue, 18 Dec 2012 00:02:39 +0000 (16:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 01:15:21 +0000 (17:15 -0800)
rtc_device_register() returns a pointer containing error code in case
of error.  Use that in the error return.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Miguel Aguilar <miguel.aguilar@ridgerun.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-davinci.c

index 14c2109dbaa3dbed844144864fa7b7a3d4190ec8..fd95316743c9f5ed8785c94fc235fd4357274ebb 100644 (file)
@@ -529,8 +529,9 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
        davinci_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
                                    &davinci_rtc_ops, THIS_MODULE);
        if (IS_ERR(davinci_rtc->rtc)) {
        davinci_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
                                    &davinci_rtc_ops, THIS_MODULE);
        if (IS_ERR(davinci_rtc->rtc)) {
-               dev_err(dev, "unable to register RTC device, err %ld\n",
-                               PTR_ERR(davinci_rtc->rtc));
+               ret = PTR_ERR(davinci_rtc->rtc);
+               dev_err(dev, "unable to register RTC device, err %d\n",
+                               ret);
                goto fail3;
        }
 
                goto fail3;
        }