diff --git a/[refs] b/[refs] index 4c2467f8bdaa..21b58de7522d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d833352a4338dc31295ed832a30c9ccff5c7a183 +refs/heads/master: 7ead55119ba58523c31f52365b5eb33f3bb34b3e diff --git a/trunk/drivers/rtc/rtc-88pm80x.c b/trunk/drivers/rtc/rtc-88pm80x.c index a2f956d90de0..7e050b44b2de 100644 --- a/trunk/drivers/rtc/rtc-88pm80x.c +++ b/trunk/drivers/rtc/rtc-88pm80x.c @@ -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; }