Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index 6ef9c62d5032..f50a1b8e1607 100644
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -123,11 +123,18 @@ static int test_probe(struct platform_device *plat_dev)
                 err = PTR_ERR(rtc);
                 return err;
         }
-        device_create_file(&plat_dev->dev, &dev_attr_irq);
+
+        err = device_create_file(&plat_dev->dev, &dev_attr_irq);
+        if (err)
+                goto err;
 
         platform_set_drvdata(plat_dev, rtc);
 
         return 0;
+
+err:
+        rtc_device_unregister(rtc);
+        return err;
 }
 
 static int __devexit test_remove(struct platform_device *plat_dev)