Merge remote-tracking branch 'net-next/master' into mac80211-next

[karo-tx-linux.git] / drivers / rtc / rtc-gemini.c

diff --git a/drivers/rtc/rtc-gemini.c b/drivers/rtc/rtc-gemini.c
index 35f4486738fcef0c496a631858ce3961c6c20793..e84184647d1525fe720c6ed73f86da92f3d634ce 100644 (file)
--- a/drivers/rtc/rtc-gemini.c
+++ b/drivers/rtc/rtc-gemini.c
@@ -148,10 +148,7 @@ static int gemini_rtc_probe(struct platform_device *pdev)
 
        rtc->rtc_dev = rtc_device_register(pdev->name, dev,
                                           &gemini_rtc_ops, THIS_MODULE);
-       if (likely(IS_ERR(rtc->rtc_dev)))
-               return PTR_ERR(rtc->rtc_dev);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(rtc->rtc_dev);
 }
 
 static int gemini_rtc_remove(struct platform_device *pdev)