Merge branch 'akpm/master'

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

diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index 7e96254bd365eae1f73b5fc296f7e705b58e05ee..974b9ae252ab5f116d9fa6faa21d587029a3f18a 100644 (file)
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -152,24 +152,24 @@ static int __init test_init(void)
 
        if ((test1 = platform_device_alloc("rtc-test", 1)) == NULL) {
                err = -ENOMEM;
-               goto exit_free_test0;
+               goto exit_put_test0;
        }
 
        if ((err = platform_device_add(test0)))
-               goto exit_free_test1;
+               goto exit_put_test1;
 
        if ((err = platform_device_add(test1)))
-               goto exit_device_unregister;
+               goto exit_del_test0;
 
        return 0;
 
-exit_device_unregister:
-       platform_device_unregister(test0);
+exit_del_test0:
+       platform_device_del(test0);
 
-exit_free_test1:
+exit_put_test1:
        platform_device_put(test1);
 
-exit_free_test0:
+exit_put_test0:
        platform_device_put(test0);
 
 exit_driver_unregister: