Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-nuc900.c

diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index 248653c74b8010e0d942947c4cfddd9549379880..a53da0958e95ad6dbd203cbfaa161b7efe2b0168 100644 (file)
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -229,10 +229,9 @@ static int __init nuc900_rtc_probe(struct platform_device *pdev)
 
        nuc900_rtc = devm_kzalloc(&pdev->dev, sizeof(struct nuc900_rtc),
                                GFP_KERNEL);
-       if (!nuc900_rtc) {
-               dev_err(&pdev->dev, "kzalloc nuc900_rtc failed\n");
+       if (!nuc900_rtc)
                return -ENOMEM;
-       }
+
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        nuc900_rtc->rtc_reg = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(nuc900_rtc->rtc_reg))