Merge branch 'for-4.3/gembird' into for-linus

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c
index 2fe537f4e2bd..8247a29a4eb4 100644
--- a/drivers/rtc/rtc-ds1286.c
+++ b/drivers/rtc/rtc-ds1286.c
@@ -332,13 +332,11 @@ static int ds1286_probe(struct platform_device *pdev)
         struct resource *res;
         struct ds1286_priv *priv;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -ENODEV;
         priv = devm_kzalloc(&pdev->dev, sizeof(struct ds1286_priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         priv->rtcregs = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(priv->rtcregs))
                 return PTR_ERR(priv->rtcregs);