]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
rtc: sh-rtc: Handle rtc_device_register() failure properly.
authorPaul Mundt <lethal@linux-sh.org>
Wed, 7 Nov 2007 05:58:09 +0000 (14:58 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 7 Nov 2007 05:58:09 +0000 (14:58 +0900)
Currently if rtc_device_register() fails we have an IS_ERR() on
the wrong pointer, which causes this to always be skipped. Fix
this up to actually check the right pointer. The return value
was always correct, even though the check was wrong.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/rtc/rtc-sh.c

index 78277a118b6773268d7813b33d3fbe19dc79d6d0..61caed506c3175515c7c83abb42274bf250d83dc 100644 (file)
@@ -588,7 +588,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev)
 
        rtc->rtc_dev = rtc_device_register("sh", &pdev->dev,
                                           &sh_rtc_ops, THIS_MODULE);
-       if (IS_ERR(rtc)) {
+       if (IS_ERR(rtc->rtc_dev)) {
                ret = PTR_ERR(rtc->rtc_dev);
                goto err_badmap;
        }