rtc/rtc-88pm80x: assign ret only when rtc_register_driver fails
authorDevendra Naga <devendra.aaru@gmail.com>
Tue, 31 Jul 2012 23:46:22 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Aug 2012 01:42:50 +0000 (18:42 -0700)
At the probe we are assigning ret to return value of PTR_ERR right after
the rtc_register_drive()r, as we would have done it in the if
(IS_ERR(ptr)) check, since the function fails and goes inside that case

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Ashish Jangam <ashish.jangam@kpitcummins.com>
Cc: David Dajun Chen <dchen@diasemi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-88pm80x.c

index a2f956d90de0448faf2c4fc9735706aab28f4568..7e050b44b2de40ce5564f6594d30d6a416e669c7 100644 (file)
@@ -314,8 +314,8 @@ static int __devinit pm80x_rtc_probe(struct platform_device *pdev)
 
        info->rtc_dev = rtc_device_register("88pm80x-rtc", &pdev->dev,
                                            &pm80x_rtc_ops, THIS_MODULE);
-       ret = PTR_ERR(info->rtc_dev);
        if (IS_ERR(info->rtc_dev)) {
+               ret = PTR_ERR(info->rtc_dev);
                dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
                goto out_rtc;
        }