Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / rtc / rtc-rc5t619.c

diff --git a/drivers/rtc/rtc-rc5t619.c b/drivers/rtc/rtc-rc5t619.c
index 24e386e..e73102a 100644 (file)
--- a/drivers/rtc/rtc-rc5t619.c
+++ b/drivers/rtc/rtc-rc5t619.c
@@ -356,10 +356,8 @@ static int rc5t619_rtc_probe(struct platform_device *pdev)
        int err;
 
        rtc = devm_kzalloc(dev, sizeof(*rtc), GFP_KERNEL);
-       if (IS_ERR(rtc)) {
-               err = PTR_ERR(rtc);
+       if (!rtc)
                return -ENOMEM;
-       }
 
        rtc->rn5t618 = rn5t618;
 
@@ -428,7 +426,7 @@ static int rc5t619_rtc_probe(struct platform_device *pdev)
                dev_warn(&pdev->dev, "rc5t619 interrupt is disabled\n");
        }
 
-       return rtc_register_device(rtc->rtc);
+       return devm_rtc_register_device(rtc->rtc);
 }
 
 static struct platform_driver rc5t619_rtc_driver = {