Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi

[cascardo/linux.git] / drivers / rtc / rtc-rp5c01.c

diff --git a/drivers/rtc/rtc-rp5c01.c b/drivers/rtc/rtc-rp5c01.c
index 873c689..89d0736 100644 (file)
--- a/drivers/rtc/rtc-rp5c01.c
+++ b/drivers/rtc/rtc-rp5c01.c
@@ -251,21 +251,15 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
 
        rtc = devm_rtc_device_register(&dev->dev, "rtc-rp5c01", &rp5c01_rtc_ops,
                                  THIS_MODULE);
-       if (IS_ERR(rtc)) {
-               error = PTR_ERR(rtc);
-               goto out;
-       }
+       if (IS_ERR(rtc))
+               return PTR_ERR(rtc);
        priv->rtc = rtc;
 
        error = sysfs_create_bin_file(&dev->dev.kobj, &priv->nvram_attr);
        if (error)
-               goto out;
+               return error;
 
        return 0;
-
-out:
-       platform_set_drvdata(dev, NULL);
-       return error;
 }
 
 static int __exit rp5c01_rtc_remove(struct platform_device *dev)