Commit 7ead5511 authored Jul 31, 2012 by Devendra Naga Committed by Linus Torvalds Jul 31, 2012

rtc/rtc-88pm80x: assign ret only when rtc_register_driver fails



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>

parent d833352a

drivers/rtc/rtc-88pm80x.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -314,8 +314,8 @@ static int __devinit pm80x_rtc_probe(struct platform_device *pdev)

	info->rtc_dev = rtc_device_register("88pm80x-rtc", &pdev->dev,		info->rtc_dev = rtc_device_register("88pm80x-rtc", &pdev->dev,
	&pm80x_rtc_ops, THIS_MODULE);		&pm80x_rtc_ops, THIS_MODULE);
	ret = PTR_ERR(info->rtc_dev);
	if (IS_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);		dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
	goto out_rtc;		goto out_rtc;
	}		}